From c6a78bb345b5b7d09edb46f78fdc78ad3e53caf0 Mon Sep 17 00:00:00 2001 From: Seil0 Date: Sun, 9 Oct 2016 16:05:44 +0200 Subject: [PATCH] code cleanup better style and overview --- .../HomeFlix-Local_de_DE.properties | 16 - .../HomeFlix-Local_en_US.properties | 16 - bin/application/MainWindow.fxml | 46 +- bin/application/MainWindowController$1.class | Bin 2607 -> 1184 bytes bin/application/MainWindowController$10.class | Bin 0 -> 1573 bytes bin/application/MainWindowController$2.class | Bin 1590 -> 2199 bytes bin/application/MainWindowController$3.class | Bin 2456 -> 1305 bytes bin/application/MainWindowController$4.class | Bin 1518 -> 2027 bytes .../MainWindowController$5$1.class | Bin 1319 -> 0 bytes .../MainWindowController$5$2.class | Bin 2354 -> 0 bytes .../MainWindowController$5$3.class | Bin 1441 -> 0 bytes .../MainWindowController$5$4.class | Bin 2216 -> 0 bytes .../MainWindowController$5$5.class | Bin 1146 -> 0 bytes .../MainWindowController$5$6.class | Bin 1418 -> 0 bytes bin/application/MainWindowController$5.class | Bin 3232 -> 976 bytes bin/application/MainWindowController$6.class | Bin 939 -> 1276 bytes .../MainWindowController$7$1.class | Bin 2381 -> 0 bytes bin/application/MainWindowController$7.class | Bin 2060 -> 2235 bytes bin/application/MainWindowController$8.class | Bin 1770 -> 2461 bytes bin/application/MainWindowController$9.class | Bin 0 -> 2590 bytes bin/application/MainWindowController.class | Bin 37473 -> 36783 bytes bin/recources/HomeFlix-Local_de_DE.properties | 8 +- bin/recources/HomeFlix-Local_en_US.properties | 8 +- .../HomeFlix-Local_de_DE.properties | 16 - .../HomeFlix-Local_en_US.properties | 16 - src/application/MainWindow.fxml | 46 +- src/application/MainWindowController.java | 482 ++++++++---------- src/recources/HomeFlix-Local_de_DE.properties | 8 +- src/recources/HomeFlix-Local_en_US.properties | 8 +- 29 files changed, 327 insertions(+), 343 deletions(-) delete mode 100644 bin/application/HomeFlix-Local_de_DE.properties delete mode 100644 bin/application/HomeFlix-Local_en_US.properties create mode 100644 bin/application/MainWindowController$10.class delete mode 100644 bin/application/MainWindowController$5$1.class delete mode 100644 bin/application/MainWindowController$5$2.class delete mode 100644 bin/application/MainWindowController$5$3.class delete mode 100644 bin/application/MainWindowController$5$4.class delete mode 100644 bin/application/MainWindowController$5$5.class delete mode 100644 bin/application/MainWindowController$5$6.class delete mode 100644 bin/application/MainWindowController$7$1.class create mode 100644 bin/application/MainWindowController$9.class delete mode 100644 src/application/HomeFlix-Local_de_DE.properties delete mode 100644 src/application/HomeFlix-Local_en_US.properties diff --git a/bin/application/HomeFlix-Local_de_DE.properties b/bin/application/HomeFlix-Local_de_DE.properties deleted file mode 100644 index b45c53e..0000000 --- a/bin/application/HomeFlix-Local_de_DE.properties +++ /dev/null @@ -1,16 +0,0 @@ -# HomeFlix-Local_de_DE.properties German Local -info = Info -settings = Einstellungen -play = play -openFolder = Ordner \u00F6ffnen -chooseFolder = Ordner ausw\u00E4hlen -fontSize = Schriftgr\u00F6\u00DFe: -checkUpdates = Auf Update pr\u00FCfen -autoUpdate = beim Start nach Updates suchen: -version = Version: -columnName = Name -columnRating = Bewertung -columnDatName = Datei Name -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 -infoText = \nMaintainer: seilo@kellerkinder.xyz und \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz \ No newline at end of file diff --git a/bin/application/HomeFlix-Local_en_US.properties b/bin/application/HomeFlix-Local_en_US.properties deleted file mode 100644 index c6eb5ca..0000000 --- a/bin/application/HomeFlix-Local_en_US.properties +++ /dev/null @@ -1,16 +0,0 @@ -# HomeFlix-Local_en_US.properties US-English Local and default -info = Info -settings = Settings -play = play -openFolder = open Folder -chooseFolder = choose Directory -fontSize = font size: -checkUpdates = check for updates -autoUpdate = check at startup for updates: -version = Version: -columnName = Name -columnRating = Rating -columnDatName = File Name -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 -infoText = \nMaintainer: seilo@kellerkinder.xyz and \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz \ No newline at end of file diff --git a/bin/application/MainWindow.fxml b/bin/application/MainWindow.fxml index e44b558..66c273a 100644 --- a/bin/application/MainWindow.fxml +++ b/bin/application/MainWindow.fxml @@ -4,18 +4,15 @@ + + - - - - - @@ -30,8 +27,45 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/application/MainWindowController$1.class b/bin/application/MainWindowController$1.class index 2f056096424b7446c4df52b0f04289cf28ed9cc5..af86c65935240a5da79e109b2cb84382732da41e 100644 GIT binary patch delta 626 zcmZ{h%}yFo6vzJuk;#nH29V02(gL;!_%Rl3t-%dVnsmW}gx0v7zy)bxtZ*gnd7%n43B0+^_%doO3@XF3sroKVNSE>|oD8h>%lR z%3YL~oYV(zL_uJP~FYl&}VhRvEFbL7GvVFwD~0H*AdIs^8{v@p&Lz#&+O$ T@Pd7q-{K`+airU$bLQ_ay+Dq+ literal 2607 zcmb7F-BTM?6#w0PuqA8@tqqpe+JaOQXxT%M}5$7w4S@!kT8S^!ff{5yXXGSIluF}=YIF^ zSKk778TTXv82Z%JRYTWQSGP=MTGh=3-7HueDa&+i%P_dzpO6q@=vqQ%^xy!oKf00~eTKP(n^@wij?kK~# zSZnimjvz4E-&=_9rMzN%OKSFkFvinvgJ?ceuSS;B$hMq-Rs5FYDU6xzuDu1lyj~mrT_y z*%aoTgCLI#?u8z00>0NOo{Qilo{?~h;cTnQ$T*E>84jtM#vQMkQwOO}jT%izNfR1# zNIo@cghrAbIEy|By>&6|Z!F_E^i#KVQ08=(6Hmwe=yvHf zf(cAXnB3J0s#=zDRUmY@R>s=kc1m@)sLM4O*O94xYn5z`PwL_- z=xKK44GBPo^j?q6XxM$^k2{%P(mTLl^G*dS3l+!YacdTBhR zVlgQ$1UYTeEt)b^$Kej?kQ7Ky7_6&HTz7Pn2kB{t$gqP(ml2?UATluc1>}LpIP#EY z0UQ-;-WS@i^2NPv#(${h~RMebIeqC^hCoIyc)n3M$34kjPdGnx{PU>l=04e z^j4RA7Y!RK$dR*;!Ymq&h8{e5=;2^y4GceLcplYz6Ptw)@|`5Fb3* z5;TQ8nufg8f5s8^3;Niv7-PR-iv5l?_6I(u@qP9uK4X93dwT!K{`RQ6O2r_Wd@99A zMc$)#8yX58@!Q}u3gQTUz#^8&+c@U2OrtP9#iT#d38z{Zfw4jucWLD?!v9bZLeahe1$+akC^nij7WshIkGj3CaOAurch{o7z~5t{ z)euEL`=gAr+ar|F*v2-S&Q51%o_Xfw_n(790Jrg2hsH3?_x5bdtiV8lQS35G~U z8jMsdM?7!5s|oJ~ui1iOtm2y7u5!IUo#9!g(uIZ1nlHSj z^k0>%tSXx}e{C#XG!kuW%i4B$(C`T7n|?eO^QT>}b#Z>$DqD?X5?6FwK2hE_JOfv8 zjbX@g0+oPbvm8efQ#w)%$zHWIFpV@h@I|2Lrb=bXGGr1r4BSM9a^ z{G5Tj^c+{7xoN*t>Nx}Rvgn4-n_^1@f#qydJvFzxli= zp~3jc2Kumf)I=+N1nOR}|LCLk9CnsE)MTqVmTBI4w`H8>=DvXo7$-ir+=ge0r0{-Iu^GXR!I$dRXY7NHY^%x0LRWoYyT;<@}67`d-F`-yHEMx{>uL$9?1 zjM3eoH&S~J=joS8D#+p@$r>&xZy!mD(mj>?3}dc^i59L)QJ!y@X(2167G`CThzc?$ zA86k(to^`*c8H|*Qw7Vl9fiTjB??$j08&`Ql7g1PEs`R%p^v~xt2>nJI)S?zrnpF+ zB&g9`{ul1e{=(!OofcM(GaXcpshi16vJu6ql8Rw=53r`RNj$_lNs>Lu1%3Vkh3=Zl literal 0 HcmV?d00001 diff --git a/bin/application/MainWindowController$2.class b/bin/application/MainWindowController$2.class index bc635f4d45c87371c4c81c25448410ec265f2af6..5c4ee4883d95d599f0b73d285765de1677c62c60 100644 GIT binary patch literal 2199 zcma)7Yf~IW6g|xnhFzOL$csdyn}o%Q`YR$<`I3Kcw1K`Gpv2m>93zAvNxQ3ve|J*#3vxV{L=?)>tq^t6KxhBL;xQg`Ks z4759Gey2rHqGb#nx}xI#wSqEnrvWH>kconZPbPCUtvE^&xWf<7W9&1sS?p+npmW0vPL?sMk z8Rar~9a#r&P@zeg2Rm|{#|4H=TnRVtD&dD^y94{yG!>B>vMF5^x>L%Rl%Ws(9GCFs zUh&r$uD?X_`vW!E8sr$l@Ls4PU)et`n5?}yo4&GrnZn!Zlw5;TK7dIK4brZ}FC`eNs z&GSOhRZzC7cpqa9NJe}oh@q0>1Ca2$%TkXo$Dv=-vLJMY;lyA9&mOxZjN$!5j&YkX zmfE-)+XTm5BYqx>4Ox_0Q_eU|6H^=?VcML>mBNZBFRFO>D2lGRVomi% z3^FKT#R0XLU3KK=C+nVEH%)<~Y&NFbs-vidx3&-okDQO#w#jhTRNbwbYTjMUc8D1J4g*67Q_km9WH7H{|t_ z(ygNJXqs2vnj|6fd=SWJ!WVHYV`K?Nik>52Jw4`1pj$3QPZ|c`EA({}ZS)UhhA;mH zKKwh5KBG|^jv1Ssq18;Im&Tmd80&GIpf_y+P9;(PrKl!uF#Mc?(6f!xtbudexY!&G z{Eef(;&Sh`2ChFve$Q>7f%h7?Z43?EF|X&CY>x5`%xvS6-UkgldXU=2(o^)znjnIL zj5OdqqwEDN;W0@qWh=gcE-Gvjy{t|b$QJt96AZ9#=-7RW+w40O*!OtEe!vp@5rX{$ z#ePPW{bJE&n+Otggas8S${+~$D%OY#pAdE;HBfg@;yvSpznb75qFKXYdie5R2pU-5 kBe8>A3|WRio>=X8lBG`6wLN#{)G%zQK7%>4TO<0pVSsOZob=K0~FZJ9ija)_+rmq)>4-8U4tSdvZ0_t8b{Yr540Mb#q@?!UheAVe$1k+G-4cb$J{gIc zZv`Z~5sJ3RN2vt4P)*%dvto!$M}TdA80Ft+-7Q1H(B3I>zFNV8TEQ35G~U z8cftIN4#jgZwT)tZ`guis^*&9u5-_l_fQ#?Fd5PVqo&sgrf#Y%n+(r0wLV4IY52lx zOZRnIl%lffmahw?k4A!x?OJ;d4_Y3kMO-6Q~4KF{^PTF|Q-VkQ_v%ftyH^178HH+C)^QDnll5%fM}9=s#|n!uQkbLz1n+ z=M3bftlp8*8i(L@}ma|7}YHnLnIs`!sBdUF6cl>SjkSpTF5l3%A zgPGIq^YQScg*Jx>)Ss{aXrt~F_A(u6vUMFBG;M>Ej?>gUFfff7s^_lT@=Wo}k^?f^ zZxJj@hYZ!8^7LZ(=N2gSJPK=CrYV|u>X^3c6Ia_J*ms)-9%GA!i@22t7^crIfubA} zqw3IZso322g-oL?-?7j^R!SW#${-OH zWJ*5JG>mHz%xY02wGkC8*L4&IBbO*(MFB`*6>ADw3hN|AXl0*(lU8>r*)0NhFHCWj zJV{WKx%@HiFCJrViB1Qbe={9bj;X`ROjaX`qLNBsb`Mcj+9V#~2}!bgvKI9D0~y1d Aod5s; diff --git a/bin/application/MainWindowController$3.class b/bin/application/MainWindowController$3.class index 1626f469bdea5c245bd3e855495b54874e646b27..9d9ab879bf85ba810da8e327f15dd6273176ee3c 100644 GIT binary patch literal 1305 zcma)5(M}UV6g@)=OX~_15ef=LDB2cf(W0P53^oukMNKf(#HVFDl*MJ1>`oE?z(oBR z6RgGu!?Pb{yfZAJ5KU>byEAw0oO{l>Gr#}*`~_eZj}3G%jN7}rp6l4s^@X)&yW+Jg zYX1AOFJ$0*9uKlb1967bw!LRto-OLui;ZpWNCRCALn^wtZ}B}Yq_wQxPi;}7Z46y< z%MG(LRHD+ZMv1Z)T;a+^hRIy}^n8^eUiND|0fvhv40INJIa+DAUR{YUH|G7q)B!l(*WV z3fk=PS)Ra7o4V3hibe z(MNNW_NeG(^wXCqcOsOx5lW_TKp^xSV6cgiLrgR=`2%?sYU1_@bdRFJK4Fl3#wh!u z;RkfNOau>PFoQcpe2EI(jSA(XLW#oEA&O1hJAv%d?8p}4rWD07r$_U6puZ1M($O>) Mut+22fYL+1zuwVIIRF3v literal 2456 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 diff --git a/bin/application/MainWindowController$5$2.class b/bin/application/MainWindowController$5$2.class deleted file mode 100644 index 33748b6f07d5f4f266a2438ca509596f2d02913a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2354 zcma)7TXWM!6#iBYD0UYT!Y$B34Ft%A;9xF=hSH`XA)yHboF?hL8+l`|ktHLo6Q{SC zKD2*@XFAl)^r6$Y&h!uUt<$q>#c?{!B=X3T&h9zqJKuhL_V0gx{{z4c{NTc27!b9Z zuRNhu806-K3YJw+3^yjjKu4kP%V^-{K;A_cLvKZ_i<~clQtt6;MS9xBL55Sty4J|a zbs6Z~l=+_#L6IC84(hUs2d+_)xxKTD)BL+CQ2HLj<-z?p3@tHqO@>982E!o^7u^}8 z(8G~NFGFh3Oz4?YfqYc2uF7aptoo9nZ!YwNza%1Mz7u1Yfy!`cA9)Az25Q+B$#7w?61)b32;p~I8oJ>dhtqn}kRZy}5{Qw`jm|)=B zK@6E3lekZtrzG{nY8?7?Ef<6?GaMUC%CmhS31irr=6GNe#!{Q9#x~3G(CkDWi*;F$ zT2szAO#^cr^LS($#M;7|C^B4_^TKMbvKGofHF937`NX-0(<_Uzp{JGfi*|h%IGz|_ zE&*$0Dd1xliwx)X48XCp4bTM5Us?xrSd<+=OjYPl2{CXos}nM zTAwcyMQ2AVBFZjAp=pgXVO381s&SQUCeha%0;|-nWJ7wkzwPAQUW?ZHTNo6@v;ZnO zk0OV}nsrqqldi$pp`~unQk;=-R>e9iRgj&QW$L(DQC}m-k<>ECpaS2;vkrC4KAviL zvS#`dN7XD$k5xxO3-8%tBs^-42W%f_IBn6i`+8?rV_-CKN3I=VNsEVUw0TiW8tcjS z-t9OcNO&&l4E=_M*CokNN8jK$juW&Bg|HrZ(#VpIo7Wvt#PYhJjapEpKMZsimDDp8czzg@c;}@qha^`%8w4_%^hF%Y7+C_FqWb_?Z?8Fp z=y*-horWpn4SKr`hkih2c;r{`;oorhC4D(KVr+JVyqzNY=$n&|u^z=SdJ@q%(Tc)2 zMKy7M9)1PBg_Fr+3ujmp7q&3eHjMs-!@uBK-#bm*d4ZMx&mV2#{U)Xoa}zVk+bew3 zwmoj*=@ypzzG&jB<+}1_>=?E4hV3R8$H5P8k;+g;A%1 zG3OZ`I6j^@Rg|3&&z&0T&U0)!5q@-H{N$|LsN z!2=f+-aA3e#4TnpMB|3v^zg`^&`qrG(0h=k7#a<=W=ap0xYEN13a#2Hfi=88#xORi-)Wz)0eIx@y(stl8D;AZA!s(T?xhGD(*p8~6vR5H{dpDibm#*m6Z zhOyQPXt<3#3|*#WaX-{;qdgs3CY?`U1fweMGK{v$L&H6cF(eMC7K*Op(m76)Ecd|J z-*vgLj}5C)8ou#z{e9^0#pPmh+Y%a09 ziX1~aQrNe+;Km^(78oIN5?S2W@BlLuDR8#~&lc5-ks4M?Zv+oD%wmqnMH0`^e5tj@ z`KG+0X!2-Bu%Ka4mReGZ`YBSYBWwkRp{omnVcZU0G~7Zz zVQ#xM&*JO0tm(naI(J6OMr60`sxX6^M}C`4Od3tx;C5*P7p^9-LM_mQ{uF-563f(|5H~k%2?gzTR(MrJ$ zX$!y5Zsi!gwAN^kwBAG?jZA6~MX5wl^xO%wQw&7I35M$!KSQ>T=~EbywT}67jBc5a z@)^U*7fdN%L!AB)SC4Q29gna?3|0woIYP`vh>6_v86MY>KM&a%rb#~;N>Wmb<7qfs a!Lx9Dj@8hbMgcEq)=OS#8s#Mk()AZo=5`$b diff --git a/bin/application/MainWindowController$5$4.class b/bin/application/MainWindowController$5$4.class deleted file mode 100644 index 25092e3d4951417417333758491bcabbeed3f00c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2216 zcmbVNTXWM!6#iB=QS5G;;F7e2OAR$(I|MZlu1W*06PJKPpbmy!xXAJ*QAUw6l59d> zI@8N<=`%CnX8O?Kxj(AYvyzfJV6dn5XmoaU_MGp0=dyqQ^XFdxX3$ijFyxG_E!#4U zz;YdJ$*`OUmeX{fm0c(BT-z32?qY66MUr83!)P0tZ8&S%a$`f7fr=r96LNQTTWbiz z@wK*Lw}e(+CnZs}{6ILuV;Bn7Ek8F+&Z_;r>7+kvIaV;oa3(*R2ZpRj=0m>YzS|~XxM@wQ*}+lt{a{u*YRdjLS;BTfZyBE# z)+WR4e6RU1iZcwy->=D0K#_u56G51-uzKdxIE!;CruOx~ zyxXFza%lL1${;NK1&%W2sW(?iW|-=ZwibAnv!=&f(foMhC^1&SO%-2LcHfn< z-Hz(z;qMM5`a zf}Rv)pdXNQ1q%IvbaC<(c<~Q>^nz9j4$8go3!PSeLWb6y&dA-5afsg3?-(bIPe@kq zX=v?tB&h(=q6S z#mU#GpM8yoQ}lH3-G59Bg@&m)!dO8Eeh8&UarBSzgw{#Acb>u|DMRij=q-PeGy44t DFKc5S diff --git a/bin/application/MainWindowController$5$5.class b/bin/application/MainWindowController$5$5.class deleted file mode 100644 index 1e024031cea8425cebc719813159136263f5e045..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1146 zcma)5+iuf95Iy6hb>kWm0<=k?5K7wS0yQ8aA*HHRMMbTY!b4Gb-Z)F*%B(BfDf|Kw zd<+toiU-6qABC7TK_nGbvX;HOvomMToE`uC_3b-=$9Q1EAe6<)iSM~0_5$S`3QxWC zR4;hb3RD~hzAwXaquel&CghIAsc?Lu`p)z2v2kKSPk;A?>Tw`p zJ|1{c`5`B1PtVe1|7}ls@eX0LGD|?ULrAxRp3H!7$%csq3n^r6WRN4ID%v62_LO`! zeBG7d3(@r@A>R&M;deyn>HWx<)>H`_GvqBdG}S>;Bw@AEo={-d)k-EhG^-s81+17T z64s_GVB-dE5*CE($|%uoe>NSal5SeKg_4Qegwiw~Htt}JkQuRf)F7-+r@^%n=8`5L ztXwP!Vfmb3f2A_9Nhn;TrNviVwQ(Iw1nVdmhOT_->Dw&+uV=S34A*ev^_7T+A^RO9 zoW|R?ImvRob+;#v#_x28FF(7dTtA3B)jyQ+Am|b71Eplx@|%jve{ z|1HID2D*$zUOj=q4`9{mpJCU&;_^q{8MvZt$q7dr?~v!c%`w_~71wwst-%PT#j{3P ztbKxghUGJ?o`W&o!!kZ3FiU@2M=%_OyC^fkT?Skq0an>Z17>RVAK3VU%0IYycG1~2 gBkht#Em_rZFPZOSE3p<(g~O{ndlh)rLr3!X4Tmxyr~m)} diff --git a/bin/application/MainWindowController$5$6.class b/bin/application/MainWindowController$5$6.class deleted file mode 100644 index f684ef69cbd571062b478d9355c1ab1d5ced1442..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1418 zcma)6T~8B16g{&oY+F~URiH(vh!y&w6i^Dfh_(a+NzsQYCcX{Z5f<0o+TEi6!o+WW zfzKw2#0TTEKgxJ#yTsOL$~N1XxpVK_bI(1qKYxAu4&WLpDinqcZ!|2^;GXH&#SL!S z4^6x7JYR8aujyEpXlCX!B^6~R8en+)LOcl;t5#8@$L~jN(oWm$Xgd2u%ecslN$3suhdJJidt2oav-V29@3z%St1}Nqh7)rfi z=sBN;wmfQH)3mqs2r>+8CWc95RZMj$sO_R5hdhxfp0&6|^bfYl>=c=vdlbQCI%iha zFs-488S1txymHHP9yIFQqn>sJ2I(dHY0PQ3D%GI5d{5Mb=Mgf>)aUD!VdVeaqbxO# z8&5WPBM`~(U%fu+vWn{r$^Xe9M(Wfx3}T2OR&!cSL)IIRtio_o4-TR%1b0@tx=4$p21lfsZAIP zPWcd=QptaYc8K9aj3q7};L<)u152WCfGffL0J9&FI@%z=jt!YTHq)$ diff --git a/bin/application/MainWindowController$5.class b/bin/application/MainWindowController$5.class index 1a46679a16a14e34e6caa21bbb2355a569b97629..d3530924416c5276e25177e3d73f277d858aa39d 100644 GIT binary patch delta 256 zcmZ1=d4Zkl)W2Q(7#J8#7_>KXbusdAF*0x@CMTyB7ps^}p3I>>`4oo~ivlBq#N_!L z5|cPt*pzq}L>a^;CvZ-c&}0x`WDqJ&Eh)*&OD}dR$xF`3OwLYCnashZ!pJ;Xm&=HW zapvSiE;$bd2L?t4CZIJOT3Z-+b})!<1hSbJ1c4+MNStvF13Tkf1|c9{45E%fm_Y={ z1L|OqVUT5D6mSGuD>wN8w}_|wHU>q6em0=VKm)*fK{l{3C<93*1{DTXFs;U*4i=SQ Q&|uI4vbcb1K{|i{01*%-4*&oF literal 3232 zcmbVOTXz#x6#mY%G$ahRAe4fFTvBL?5?We{4OH7g1xz8D+R`G(baI+bna zL&Y23Q7)qR;H$2M5$)2&vv0onsK3LtT<$$HEvXQaWxCRnbIv~deEZwq+2{QB&(FUC zXv38d6oHM})RbxHnrqlryk9e{A;Zepr+RJ6&Do|YbJ6w?ss-vMv}rAFYF0LWcyvPQ zZU{93t9f*6CN8I?<;M5%|NWYkp=AO!?zrJZx6>BMa(g7mdbeR2ZkIq~Q+e~)pg?u6 zosnS(EL9Q0;s~lxt0Ig#fvP4ps7)G{Jd~dtmAL_J)RY3tleVszgIdnuelS?gFa@Gz zca63)%yBO~fwfJ^1+jPQ%%I0WA~qO71J;DFT3~&-*j3zz`vt<9u1m*>wzOAB!3giM zPQ?RQU$lCsz}`v-oCELZ(vp{VX2}Kn+29+ zrQ17hn3To=GghHf#?eF0dikvNSXmEoh}=Yne>9X$sUg9rfZV)_)>45+*hBPx2`7TmiIb}rKqb(71pp#`y+S^i| z0MaOnZx0>`fzHx~vQSh!if&4uBi+N6uVG60f3#hEt^;xRs@RKtMG2ySDidBQNIiMi zwJoCNvC61vji3*m5gg=LA1Bavcg(r!S8)i33G^h@xnA3}sY*4LOqXYnGW3%&N2s2t z4AqVZQjBVVQ9VU!D21xXJ3|{%aRkFux*W5GibhFLY17CMo(PWOSO`zwC2ZeP#c@1C zHF8=r^D>pQr)17OEzor9fR0Mda^h3LRD7?Ur}H^yNr7vX1>P3H2@X7iu@I=%MuS6k zSNAHi7$^17Ipc~zrHC@Jd0u_~S`T`>mkMvzs~c<;sBl8X$zm0@wuLZR8Q%5?Ovc-Q zDHYFx_MNN1t#q0XmOpBVSji*}*x9Tp=LPLnhG=I54kJ3n(wU((rKD5ro&$JJ#q)Tf zC;&Q(L}Iz}k{F2%a#4Iq#Tl-4;hdbbrzI6UE+DU{conY+gs8A{;SyL8XvQysX*XwB zSrTFc&Z>9=Z;~k$k(B0ALRb1JTwv*6isw|k%~!PQXwxz+U6-8D?Yqc(KnSdvyEeRj zy!cWj5vN^EKiRKM1vmGqd7=2$UYR0ggz$ktL!iIg97X8K@R5p@s25l~cj*f3FHaa3 z*Yd0iMACLXr^`Nr-yEy&^rqUz;E3_Gk+n28pCh{iw_h*|x$vS39#^{;P8HMCMHfZw zK1(-khp6qB?zo*%afvx!$}g-QcfQQ42P`^Dy{6_k(!qM-rHa0bAnNM)MMaOqYWjx3 zj4h#GyP(h?5NY1}1JvdpanJYEQ?QK3yct@p3}HF-Ra(QN_hJRLqzKgeUc@l%z+V1p zz7F*UR$as;|JT|AHdOzDEyGoQKbHOp4=EVp-gWGlMaMAh`EUWd{rR3*^zq340uJ~# z$yua$WefBeOWcgQErL{z79GCXZOb!W*z>;qXYlfN8d=zJb%dUQ3V6AI*SS-`TijHU116`+Bc}_s#M1~O%26~a$Iz){kW^-HTsZ?rIft{#d0bE~ zbi;M_kEfX zBYUPf+`RQB&KL0Etz6ZR3Fn0KL?(5M@i9ILmNin#vx_*2?>qxeueT&fEqkrTr{3IW oxZt&);|p)J0T*$Zesz+7*bRR={Dy98|C0*Z6G3YRt>d@<0-;Qiw*UYD diff --git a/bin/application/MainWindowController$6.class b/bin/application/MainWindowController$6.class index c68bdd0607ecf2428ca51b387415a9fecb4b236d..3c55e27546693aded7e9e4a02739424008c0e2bd 100644 GIT binary patch delta 590 zcmZ9I&r2IY6vw}BjV7)uu8F2=YBi1VN0MrcT7NWcLC=bZv=#I;u7ju{YIn>v=X#U9 zsFzaPD$y{@nfqFom~Q<{Gt`aF7V2 zhmbt7lQ9cV(MyO3*Oi`^o*_&heM#3Aw?$Rt%c8QGFR71PmCa%VeFPdekwhwt=LGw4 ziG=~A2`zH}K$JZ~_s9d4<@Igps$ym}f+5x^Xp9jH8Dt6Vo>cP(YWMx#hEP&B&OYdD z_-8)omKPRAVG}G*RAosj#b|8REUU7j2noMnB>1|$q=dV(B=+8k^|JI2sW&u9aQuC8 znoSU1`uB94u<%-IMcF>kSx^&TAXTpJ4C= zCbQSDZtx`ftd9N@#Pu;cSjVsq>d0Ln7Nq$4f9i_cn$XE>AHuA9h7S4)hrXeoz9U8F z$kpfq6Lc9c#Q*s;7}ybG$TP(_3xr^#I_!DoDm1t<4X)N~?hX@mOldbGaBJZb{RsUq cjUK{u5Y1pV*yr#n$T}$6c*CLoE#1Q7FLUo|@&Et; delta 252 zcmeyvxtg8p)W2Q(7#J8#7&JC=MKf|UGO(tWrRJ3|GDuDKXO^10f=Px&nvp?basac$ z#vs7Rz?+$uS>jZZ=a^iQnV&a#I&(M^)AGq5nC0tD zfhIEnG2=!sLl8)^F)#wf)-ebH*$`t5Ph>Utfh>xFqa{L2(ZBiMm`8fOh_E#i`Zb0W1KtV)mU1y+BLf)Th3LL z56NHQGbtimIS8p7RPl%MEtQ_pT9#9;vRAd*-Ja>!uiy0ay!`j4X8}NQxtxJ`x zT$R4cj_LnN;pfSbVZSQ6QO5uUnch9hFwMX2`mVacaK39V4&Cz%O`}0xCc)6cVWT;P z1X?+gNHZk5^n})F*O#};r9~OeiA7H`v`q(&@a9G6>hIXtq^UBT+e6%r0Zp}Nl4Lm9 zHN8!N5l1U&bQtcQPoW(rY#e7ev%3Nuui`a^X5lz8GP+IfO^01c52tVn85^%NWOn1h zaT;eBlAA29F^uj`W4L=$hDeEm%-(cEs*oUDA1ww!Btv4*fpa!GNwHY3ohNdfM;AjX zDh6veUEu`#o0=*5LC_CtdVLwjIv$k&ndx}CyBjx72c zu!a~0_kdMXq7IhCATHS;=Y|cGTaT11alC=cRH#8&F&wFLm8 zVpZm(QZyDNX<(XT2Dd3tWYQ(GTAE!Fd4{voPEg7&F9p(fD_N)3j-u?X@r5~AQRA-k z@@BH3**S)^v15#=SK97-kq z6qe!Hc+gNdQ+LKHj$F~Li=(8Ms?`)uP6_A1TqqpsoBK?QXE zpgo*(3%*e0kmgM_s98J6hPP+bc!*u!KGc}(4N9qX%y+yXqLQ1Dsu)n+@+se!;ixB~ zNJhvI*#zDDz|v`bK+(yYpgRej#w+x86&C$~R8Q}Z;5|=q;4yt!IH+xAguJb%XrpgV zKH7Q+hv`W|<7f?qaYEI&-}gKL-@vi>v4NAUinAN&t{eJZ;J^8UU6N!Ne-6NxDR diff --git a/bin/application/MainWindowController$7.class b/bin/application/MainWindowController$7.class index bfd26158f6d574d46d3c130c2695a43894e32d45..fb1ff9f520d382667f99919a3182f8319d15f7f2 100644 GIT binary patch literal 2235 zcma)7YjYGu6g|y`Om=O^5?%pB7YOFTV-%E!8^Mr=EGDqBF#$D7XSTE3$?Qy==}k8N zAwFZ_nzAel--=fGU;F`NA6q7sU$dmW53Y5OVaCTs4_rV#4j?u6z(_q-g;h-yn6uLRm z$TFk`j6?UN3gq2-ZC*yxV&0bwJ(Hm){237`Gfs>hrc8#u9kcdbHDy*UJcg44liRS5 zc!ojCKz?v0gI*kWaEu|h6LyXhc$J|`c%Fzd*4W(mbe z1-hgoDQfvHT%xJFVQ!PoTr7PeR+ck#V6HfLhvA^%#<0+~lH)1}yR&S9`2huKsiSpX zD7p$NRu%7J*a69iZv-(^a=Zr;es@Lck@-0E>sl6tt}+}NNZ{FHmxM9Azt1sZ5@utW z)J_S^8Z$Y{F=kEykHv~CNv&xvPSeB$#|OAgiDC zo&DIoGx1WY3m*&QqNsj6j81ig{Dc}4r_A4SB;BgGl@Ro z_!OT}^Nqzd5;q6mxb>wdlr0(&+^TU`V zHzjp7EORsrc_%jIydm~mnjDq4BuU!55Ck$B^+g=Z7&*d|qGvByHfyd8x(QSCq+yW0 zLSNUghyH=g(7A8GhrY%BCp6lF1IA`&Xf^vDJv8RD##j&H5WQ(Ha3qQHFGV$RgQ2Gs zgr0RAWlfx1$C=is|99;F8s~c6YU1)^6t>*@o4DS@O=D={mU%tJcxzN>VsafH^~^T$ za5lA$xyQ&(nIM9KoNvN=LfMO$!z0pM%2s>@`>3#I=wUz7CG!*d*w5%^ztH*n6*t*$ zD6&8Bko}1{_8fx!1;zeGjs0WMV!Z literal 2060 zcmbVNZBrXn6n^d|5E8bMqEe`qQVeYpv|9?Awn3DnL8t+$siDwM%jT9WUG6fw8^pij zAMmT4X=&Bb@ngpsUuOI{&N!a4StMvNjLB^7-h0ov=XsuU?#WMoe)|J}89Ycp6Bsvl zcOBa@1KU-`vT3U|TQ%Iz%dQGM*KwqmDI^dVNN<~ars0@s%UIpqmR68JufPbeKHN9t zo>YNR;on75HONh%H)z^^<{E{lc8gIY>sedb!JNQEw!3+*E)Xxf4Vi?%8664qr4Yk_ zjwI3ou`C-5RBa_!T05K4yJv1XQed#^TBcJsJ)7szVw_u3R7@au7{KBp z3bpa6aD3_QvG!Hl4~hw71SCKk5s4BZvPo|KWN}+&TT>4a>SGtQtb<73&K0Zi*?%U{p2%JBx zt#EF1-aP6CwZOCK z5|ygCEzgn*HaDh`mo?t242~42*;~pCS{~Ug{ksZ}YtfmA+2dQCGR+Zyfr_#m*SFQy zvJ9GTL&rMz&NJMGOTpi%)|Zr$UfD5yU-}p$U1Id~K%~>$cIlraPEQi7SU+ zm7jbHJ^u`^Jf@k3v%D7Wkhk_2gEZI4hgV<4YcvX$J38eBMc`AM{1fQUaqdgZwcjor z;8Og1Tv?B`=egQ9ct^updp7+Y3hNZ}<^g7TCH@?xuaG<0bs=(%ks;%Zg*eBVm-YlH z?J2U_Gu+aCMoIex74278+HZKI{T|{UYGaJ>6Iv|c4l($cPU?mB2PzZkd16(KSmnr` zStaw6KVta+t4GrGk_k(|vXDu-51-)E$Zdi~-tA!?Uxx;)X6OeD+2%k diff --git a/bin/application/MainWindowController$8.class b/bin/application/MainWindowController$8.class index 22da586cf224746a58e92f0c4c8d89b25d8ad6d8..7a65d9287d3dcdb269fc7b5a7fb00ddad624bec5 100644 GIT binary patch literal 2461 zcma)7-**#L5dQ8qvQ50$QV~V`0T@aWl%*2dYHASzl|b66DFJ`8+1#dEx4U(B)7Ez% zd{C)!_(MDgYmN^dpZ%je&g>>Mp*c-*&Ys*mckawL-`tt`_rJgX29QTnhbC~=+}w0* z%M5MLH5N_Vy=S|1Z@cKZq3=14^3$_A5(4Av=9XzVrrR)#px4$_y%Re6xF0%_0Lt{u(`oXZSW&sGHzMX#=s5I8EK zV>E>kj7cOhE-;c|g|V{js-@;eP5CQk%~1jqWzRC5s_EOjZwnI)Qy@LiYkHPo>Q)qG zUEofp+=qnaTA=(bHeY2@3Xx7XeSIVhHd(P7t{FCcg1Iz|<+&OR9I0Cy*hfOi4)!k*6?K zz2w%_PV@vzO#Ist@8Dt=rBecvLr_|Z^L9yM3h#DZr}a<;5;@OHT%ZMddg*%+M5g zDN~9Q+fyw%ZuIn^O6c2egTq*m_z1VUsJS9AGX%3;B@!DeWUEZTZHYTfz*tNGohftU zuJ5p~MTw;zU(+o8SmG0WDlpnEm%PBj5CF1e%iA#4S3Tw0JDp+)jN1$MSJX~;jocPS zu_AyJs<^M?9u@AO8xo)4bLvik3fTy=*)L8;{iVcL__~X?8G-4cU~_8Y12 zk;LP}Rol_&iQXRn{br}npC7^vH&sGc@tVG+7HpmwC;QFDi;O^^bP!2DC%uDl?%*YM zI(E~w93snYEUIwLt4sJi%91=4X;N`9%92Ziwdj~ZplD*9I;6!>ucaPD-*XV-<2)Z} z^lS7b=~YqX(Q20VEJ@`q`~jK!6EFN8=^SHObV9eaA2C6DNq1QKB97BPy)K*}jhAVy z;T5(fc>E@4zngnP#^`I|*}wD3*)WMmIDj%frO(BxNd0B>x8zP`3R5 literal 1770 zcma)6U3U{j7=C7xcAIptu}YhQd`w|6Yr zm7cPe_4}gmTC|K|SZz9C;S3#7-|LJDq30aWQS%HZi+jUMYYgeC-;x^&(rK^DU{$QUl3~2=+rnKFfurY%F|BDb6!tu|Fso^9M)DXA73;gS zFW5SQQ3NWbwJh>DU}B2l=w8}64&o(-jIeDPhJ~}|8D^d(1kv$vLYgXYyp75T4l@k7 zT4NSRaoohQU3rUP94Am9A@WW~xFmdkEMzdXmC~&dyiA-z6-d#hy|tbqM+s#HGnA@9 zv43o7LL%1w3dgHBJ)mlaVdU&oQIRgNLFkn^Gwf7G}sX%kd`OqLK=HUojl%XEwB@C;Kd{)j-Oc zl5OHJhj|lkQxPO3@MIvz1-!#Bx*=6{({WpY^mKWb`rF&OzoN1Usi#62bah$QolsRq zv4|xTRfc295l;tmEMtYpht3z26RQ21UVV|HhD(&^K(_rZIfjb0TAZ9ZM?=RUBU-H` zp~UqXd7}QhRus>~x?WA=kAM1gB^_yriae>NYrFMTe>$mM1j|P-a{UJ*yQPgioYSAXc%z3(>e28%78vg1-4tTf zWlcI2kuDQK7{6f5_!W8M0Sd-L%oxAng7G^p8-L)M@h9#We__Y?I}$Y!6Hi2u1YE&Y zlJy?#n1*rcL~enEzMlv!5n2n)l&62dwH{UvNcGoV+{?_VnI%9j8D diff --git a/bin/application/MainWindowController$9.class b/bin/application/MainWindowController$9.class new file mode 100644 index 0000000000000000000000000000000000000000..2e63ccbec8e205520592d625fbf36dafe12d066c GIT binary patch literal 2590 zcmb7F-%}e^6#nieVN2K+S__ue+JaOQXjwpu#UP5|N7DvS1ED|s(PeXirOPhtZUBAu z-8W}C(;24^j-!q`9WfOh9iDyg&3{1t3`gs^yBi2Ym>|q%@4b8Och33FchCL(-=BX2 z@Cr6$NDS@T%8F^|nrGOSI-wcXtYH=G^|Wnyj%}LU=@^g^WoTN`)-=`BtOa#yZi(xj zj5>xku{yt@&T-9h)iup5ay7k3Mm%e{9=Eu|Q0FZgZbuKf%GUCgBI`lJGQ1&%ONrX% z$vi_eZ5Mbw7>+BDaV(Aq8Wq%|i6N2@28~(6;*-VYIqpnrb0%jvm9=%v%xjJz=HX&g zgvroR(`&~7g(>TPmIa2JiEI@TrsiDktO@wMASLD71oY)R$FLTvtcYOibH;+Dc}0i9 zymu7j!LEbQLsh^JS|#&woW*l8&M{o9RT%~6@jQj6={k4aj@|)=@uL)|%#ALzqzjR` zq@OZ3LL{jMTtvH!wmmf+Zmi%1bWqJ*<6|O->YEWcyr|%%%INxf1ZGk}C%PzRhcDY} zeAqM@S_4YeqGyK2$(;Lxm38RfdKI?xhzEv*2(`$U9kvKRjKZn^zTF1MyuK`$22A54Tdw7^>samYs)jnh~{Z=3}INoTSzk;Ba~^wXn$s$1l5Q*dzOk;+U7GJbK{Hy2)tp^)bUtQ? z+n}}Dt=BC888QbwR-tcgpiLELx4L2G1C zG8SE$X;X7u?vmz6ZS=&znwrGzMi+O4o_dIE8fbJ468!`5&aNM!bUwj}$2600Qmpx3 zXt(qQPSISUJ!174oTfMF6D?%%ER7|c5oqi)@=!X5 z8@7-qXP?AabF4Y~=;>o0_v)U<=&$I#9r=ZRLWDhEPjDx3e)i;|J0Y_*~k=AN2l9D*04ir(zIIA(djJVa}&_ z2RaHq@jKu&ir@tP#5@+r+X!Z`NTV1YVk{gPgcB4-U@Q^FeOft=*gqI&>~D%h>1`UO zTAB1oRJ@mfqVzu5*|m-3%i9>eLQe_yUg7KfNa*yFnGi=5tNzFdi|xYmSI?q|bs7mV I32D&Ze+TrybN~PV literal 0 HcmV?d00001 diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class index 021d7e15100799d4e54c353d25d3683a4346fe5f..748f658548629b302bb0e75aa2402f6db885109c 100644 GIT binary patch literal 36783 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

QC zXUk)(6$lL#m&&88Dujj!_#s%oMrgR$CMQ`pA+*1Eobs&Sz;WmR2>5x{Z%yc93P8)5 z=NuW}MnV2=ToDVpCJ?p7Zw>R@T8(q7<@a0TA!6;K%H3i%9kAzuejFdTPO*+_?EmZ+ zPPFj!*efvjhm@w|=PknTT)(w#H%>%G>=`UbK{@_Vm&i1O;}E&`Zu6Y7{Q}m_)-A4( zGa6r4K@iC-A&35Egd7NVsPcR3R=3I+^yTR%)@_|KmQgCm(Y%~GcUX6J@5Z_(wG6+Bi0|?DxCxXY5&n|$X>{(^C#=i-Mg_K&64UVv&!Q+yOGPYyLmpNniw3NxvN4_6&2zcB>9EW>PX=}B zp&8x0X#J%-rp5B?ZeGo(@>0$!E3&J+mQm$p>#yB=QKx2Cxg?{?D>+FZTd||Rq^kt^ z%D>yo(by50I}O}vy^fO=>&=w)_Xp{7k^nkYr_A&tV&m05T zoYDNA27qS`_R_rdO^)VI-N)v?O*hYH4>|F(YrFMB4*Z;v(L+xB_|RIvAiuZZ4xpzV zd@6SjXYXSVc)h{xVFA88hF--fUw~=H*DHHkw`Mfj%h$(;J9!y|!zuj?*m(Y-$3_Qa zH+s#!G)l@h5U@$#ARnK=te}8zf20-p4)l#Oq0zpvzHug0?3>`5XhNmFLwu7>Xo_!| zZ@LN1@Eztm+=Pzs&GOAQp*g-;>-gybbwJp6!0m zbH5ilUz~=SKjr58Dtt%zmO!X`TfE_0Iuj0N!tYxKA?+>tgulM!@+jX5xPVpSTdDK@ EADuiP)&Kwi literal 37473 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 S7^s%(1GVrVtV9^odH)|8$TjEy diff --git a/bin/recources/HomeFlix-Local_de_DE.properties b/bin/recources/HomeFlix-Local_de_DE.properties index 6458573..70596a0 100644 --- a/bin/recources/HomeFlix-Local_de_DE.properties +++ b/bin/recources/HomeFlix-Local_de_DE.properties @@ -1,6 +1,7 @@ # HomeFlix-Local_de_DE.properties German Local info = Info settings = Einstellungen +streamingSettings = Stream Einst. play = play openFolder = Ordner \u00F6ffnen chooseFolder = Ordner ausw\u00E4hlen @@ -10,10 +11,15 @@ autoUpdate = beim Start nach Updates suchen: version = Version: columnName = Name columnRating = Bewertung -columnDatName = Datei Name +columnStreamUrl = Datei Name +columnResolution = Aufl\u00F6sung +columnSeason = Staffel +columnYear = Jahr 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 +errorMode = Oh, da lief etwas falsch! Da hat jemand einen falschen Modus verwendet. \nError: mode unknow (muk)\nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz +errorOpenStream = Beim \u00F6ffnen des Streams ist ein Fehler aufgetreten! linuxBug = Zurzeit werden unter Linux leider keine Dateien mit Leerzeichen unterst\u00FCtzt! 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 Kellerkinder www.kellerkinder.xyz diff --git a/bin/recources/HomeFlix-Local_en_US.properties b/bin/recources/HomeFlix-Local_en_US.properties index 857b80b..e1d49f6 100644 --- a/bin/recources/HomeFlix-Local_en_US.properties +++ b/bin/recources/HomeFlix-Local_en_US.properties @@ -1,6 +1,7 @@ # HomeFlix-Local_en_US.properties US-English Local and default info = Info settings = Settings +streamingSettings = Stream Settings play = play openFolder = open Folder chooseFolder = choose Directory @@ -10,10 +11,15 @@ autoUpdate = check at startup for updates: version = Version: columnName = Name columnRating = Rating -columnDatName = File Name +columnStreamUrl = File Name +columnResolution = Resolution +columnSeason = Season +columnYear = Year 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 +errorMode = Oh, something went wrong! It seems someone has used a wrong mode. \nError: mode unknow (muk) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz +errorOpenStream = An error has occurred during opening the stream! linuxBug = Currently no files are supported with additional space under Linux unfortunately! vlcNotInstalled = VLC Media Player is required to play a movie! infoText = \nMaintainer: seilo@kellerkinder.xyz and \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz diff --git a/src/application/HomeFlix-Local_de_DE.properties b/src/application/HomeFlix-Local_de_DE.properties deleted file mode 100644 index b45c53e..0000000 --- a/src/application/HomeFlix-Local_de_DE.properties +++ /dev/null @@ -1,16 +0,0 @@ -# HomeFlix-Local_de_DE.properties German Local -info = Info -settings = Einstellungen -play = play -openFolder = Ordner \u00F6ffnen -chooseFolder = Ordner ausw\u00E4hlen -fontSize = Schriftgr\u00F6\u00DFe: -checkUpdates = Auf Update pr\u00FCfen -autoUpdate = beim Start nach Updates suchen: -version = Version: -columnName = Name -columnRating = Bewertung -columnDatName = Datei Name -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 -infoText = \nMaintainer: seilo@kellerkinder.xyz und \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz \ No newline at end of file diff --git a/src/application/HomeFlix-Local_en_US.properties b/src/application/HomeFlix-Local_en_US.properties deleted file mode 100644 index c6eb5ca..0000000 --- a/src/application/HomeFlix-Local_en_US.properties +++ /dev/null @@ -1,16 +0,0 @@ -# HomeFlix-Local_en_US.properties US-English Local and default -info = Info -settings = Settings -play = play -openFolder = open Folder -chooseFolder = choose Directory -fontSize = font size: -checkUpdates = check for updates -autoUpdate = check at startup for updates: -version = Version: -columnName = Name -columnRating = Rating -columnDatName = File Name -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 -infoText = \nMaintainer: seilo@kellerkinder.xyz and \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz \ No newline at end of file diff --git a/src/application/MainWindow.fxml b/src/application/MainWindow.fxml index e44b558..66c273a 100644 --- a/src/application/MainWindow.fxml +++ b/src/application/MainWindow.fxml @@ -4,18 +4,15 @@ + + - - - - - @@ -30,8 +27,45 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index d1d0fb0..821b639 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -66,7 +66,6 @@ import javafx.collections.ObservableList; import javafx.event.ActionEvent; import javafx.event.EventHandler; import javafx.fxml.FXML; -import javafx.geometry.Insets; import javafx.scene.control.Alert; import javafx.scene.control.Alert.AlertType; import javafx.scene.control.ChoiceBox; @@ -80,10 +79,10 @@ import javafx.scene.control.TreeTableView; import javafx.scene.image.Image; import javafx.scene.image.ImageView; import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.HBox; import javafx.scene.layout.VBox; import javafx.scene.paint.Color; import javafx.scene.text.Font; -import javafx.scene.text.FontWeight; import javafx.stage.DirectoryChooser; public class MainWindowController { @@ -94,9 +93,9 @@ public class MainWindowController { @FXML private AnchorPane streamingSettingsan = new AnchorPane(); @FXML - private VBox topVBox; + private HBox topHBox; @FXML - private VBox menuBox = new VBox(); + private VBox sideMenuVBox; @FXML private VBox settingsBox = new VBox(); @FXML @@ -118,15 +117,15 @@ public class MainWindowController { @FXML private JFXButton forwardBtn; @FXML - private JFXButton infoBtn = new JFXButton("Info"); + private JFXButton infoBtn; @FXML - private JFXButton demoBtn = new JFXButton("Debugging"); + private JFXButton settingsBtn; @FXML - private JFXButton settingsBtn = new JFXButton("Settings"); + private JFXButton streamingSettingsBtn; @FXML - private JFXButton streamingSettingsBtn = new JFXButton("Streaming-Settings"); + private JFXButton switchBtn; @FXML - private JFXButton switchBtn = new JFXButton("local"); + private JFXButton debugBtn; @FXML private JFXButton updateBtn = new JFXButton("Auf Update prüfen"); @FXML @@ -167,11 +166,11 @@ public class MainWindowController { @FXML TreeTableColumn columnStreamUrl = new TreeTableColumn<>("Datei Name"); @FXML - TreeTableColumn columnResolution = new TreeTableColumn<>("Auflösung"); //TODO translate + TreeTableColumn columnResolution = new TreeTableColumn<>("Auflösung"); @FXML - TreeTableColumn columnYear = new TreeTableColumn<>("Jahr"); //TODO translate + TreeTableColumn columnYear = new TreeTableColumn<>("Jahr"); @FXML - TreeTableColumn columnSeason = new TreeTableColumn<>("Staffel"); //TODO translate + TreeTableColumn columnSeason = new TreeTableColumn<>("Staffel"); @FXML private TreeItem streamingRoot =new TreeItem<>(new streamUiData(1 ,1 ,1.0 ,"1" ,"filme" ,"1")); @@ -194,6 +193,8 @@ public class MainWindowController { private String errorUpdateD; private String errorUpdateV; private String errorPlay; + private String errorOpenStream; + private String errorMode; private String infoText; private String linuxBugText; private String vlcNotInstalled; @@ -219,7 +220,6 @@ public class MainWindowController { private ObservableList streamData = FXCollections.observableArrayList(); private ObservableList locals = FXCollections.observableArrayList("english", "deutsch"); private ObservableList streamingData = FXCollections.observableArrayList(); - private Image imHF = new Image("recources/Homeflix_Poster.png"); private ImageView menu_icon_black = new ImageView(new Image("recources/menu_icon_black.png")); private ImageView menu_icon_white = new ImageView(new Image("recources/menu_icon_white.png")); private DirectoryChooser directoryChooser = new DirectoryChooser(); @@ -233,10 +233,10 @@ public class MainWindowController { @FXML private void menubtnclicked(){ if(menutrue == false){ - anpane.getChildren().addAll(menuBox); + sideMenuVBox.setVisible(true); menutrue = true; }else{ - anpane.getChildren().removeAll(menuBox); + sideMenuVBox.setVisible(false); menutrue = false; } if(settingstrue == true){ @@ -246,7 +246,6 @@ public class MainWindowController { settingstrue = false; } if(streamingSettingsTrue == true){ - System.out.println("close settings"); anpane.getChildren().removeAll(streamingSettingsBox); streamingSettingsTrue = false; } @@ -310,13 +309,21 @@ public class MainWindowController { } }else if(mode.equals("streaming")){ try { - Desktop.getDesktop().browse(new URI(datPath)); //TODO muss noch überarbeite werden! + Desktop.getDesktop().browse(new URI(datPath)); //opening streaming url in browser (other option?) } catch (URISyntaxException | IOException e) { - //Auto-generated catch block + Alert alert = new Alert(AlertType.ERROR); + alert.setHeaderText(""); + alert.setTitle("Error"); + alert.setContentText(errorOpenStream); + alert.showAndWait(); e.printStackTrace(); } }else{ - System.out.println("error"); //TODO richtige fehlermeldung mode + Alert alert = new Alert(AlertType.ERROR); + alert.setHeaderText(""); + alert.setTitle("Error"); + alert.setContentText(errorMode); + alert.showAndWait(); } } } @@ -341,6 +348,150 @@ public class MainWindowController { treeTableViewfilm.getSelectionModel().select(next); } + @FXML + private void infoBtnclicked(){ + Alert alert = new Alert(AlertType.INFORMATION); + alert.setTitle("Info"); + alert.setHeaderText("Project HomeFlix"); + alert.setContentText(infoText); + alert.showAndWait(); + } + + @FXML + private void settingsBtnclicked(){ + if(settingstrue == false){ + anpane.getChildren().addAll(settingsBox); + + tfPfad.setOnAction(new EventHandler(){ + @Override + public void handle(ActionEvent event){ + setPath(tfPfad.getText()); + saveSettings(); + } + }); + directoryBtn.setOnAction(new EventHandler() { + @Override + public void handle(ActionEvent event){ + selectedFolder = directoryChooser.showDialog(null); + if(selectedFolder == null){ + System.out.println("No Directory selected"); + }else{ + setPath(selectedFolder.getAbsolutePath()); + saveSettings(); + tfPfad.setText(getPath()); + try { + Runtime.getRuntime().exec("java -jar ProjectHomeFlix.jar"); //starte neu + System.exit(0); //beendet sich selbst + } catch (IOException e) { + System.out.println("es ist ein Fehler aufgetreten"); + e.printStackTrace(); + } + } + } + }); + mainColor.setOnAction(new EventHandler(){ + @Override + public void handle(ActionEvent event){ + editColor(mainColor.getValue().toString()); + applyColor(); + } + }); + sl1.valueProperty().addListener(new ChangeListener() { + @Override + public void changed(ObservableValue ov,Number old_val, Number new_val) { + setSize(sl1.getValue()); + ta1.setFont(Font.font("System", size)); + saveSettings(); + } + }); + + //updater + updateBtn.setOnAction(new EventHandler() { + @Override + public void handle(ActionEvent event){ + update(); + } + }); + autoupdateBtn.setOnAction(new EventHandler(){ + @Override + public void handle(ActionEvent event) { + if(autoUpdate.equals("0")){ + setAutoUpdate("1"); + saveSettings(); + }else{ + setAutoUpdate("0"); + saveSettings(); + } + } + }); + + settingstrue = true; + }else{ + anpane.getChildren().removeAll(settingsBox); + setPath(tfPfad.getText()); + saveSettings(); + settingstrue = false; + } + } + + /** + * TODO zusätzliche infos über die dateien + */ + @FXML + private void streamingSettingsBtnclicked(){ + if(streamingSettingsTrue == false){ + anpane.getChildren().addAll(streamingSettingsBox); + streamingDirectoryBtn.setOnAction(new EventHandler() { + + @Override + public void handle(ActionEvent event) { + selectedStreamingFolder = directoryChooser.showDialog(null); + if(selectedStreamingFolder == null){ + System.out.println("No Directory selected"); + }else{ + setStreamingPath(selectedStreamingFolder.getAbsolutePath()); + saveSettings(); + streamingtfPfad.setText(getStreamingPath()); + try { + Runtime.getRuntime().exec("java -jar ProjectHomeFlix.jar"); //starte neu + System.exit(0); //beendet sich selbst + } catch (IOException e) { + System.out.println("es ist ein Fehler aufgetreten"); + e.printStackTrace(); + } + } + } + }); + + streamingSettingsTrue = true; + }else{ + anpane.getChildren().removeAll(streamingSettingsBox); + streamingSettingsTrue = false; + } + } + + @FXML + private void switchBtnclicked(){ + if(mode.equals("local")){ //switch to streaming mode + setMode("streaming"); + switchBtn.setText("local"); + }else if(mode.equals("streaming")){ //switch to local mode + setMode("local"); + switchBtn.setText("streaming"); + } + saveSettings(); + root.getChildren().remove(0,root.getChildren().size()); + addDataUI(); + + sideMenuVBox.setVisible(false); //disables sidemenu + menutrue = false; + } + + @FXML + private void debugBtnclicked(){ + //for testing + } + //"Main" Methode die beim start von der Klasse Main aufgerufen wird, initialiesirung der einzellnen UI-Objekte @SuppressWarnings({ "static-access"}) public void setMain(Main main) { @@ -348,34 +499,13 @@ public class MainWindowController { loadSettings(); // loadStreamingSettings(); initTabel(); - initBtnAction(); + initActions(); System.out.println("Mode: "+mode); - infoBtn.setPrefWidth(130); - infoBtn.setPrefHeight(32); - infoBtn.setFont(Font.font("System", FontWeight.BOLD, 15)); - - settingsBtn.setPrefWidth(130); - settingsBtn.setPrefHeight(32); - settingsBtn.setFont(Font.font("System", FontWeight.BOLD, 15)); - - streamingSettingsBtn.setPrefWidth(130); - streamingSettingsBtn.setPrefHeight(32); - streamingSettingsBtn.setFont(Font.font("System", FontWeight.BOLD, 15)); - - switchBtn.setPrefWidth(130); - switchBtn.setPrefHeight(32); - switchBtn.setFont(Font.font("System", FontWeight.BOLD, 15)); - - demoBtn.setPrefWidth(130); - demoBtn.setPrefHeight(32); - demoBtn.setFont(Font.font("System", FontWeight.BOLD, 15)); - demoBtn.setDisable(false); - - menubtn.setText(""); - menubtn.setMaxSize(32, 32); - + debugBtn.setDisable(true); //debugging btn for tests + debugBtn.setVisible(false); + tfPfad.setPrefWidth(250); tfPfad.setPromptText("Pfad"); tfPfad.setText(getPath()); @@ -410,14 +540,6 @@ public class MainWindowController { } versionlbl.setText("Version: "+version); - - menuBox.setSpacing(2.5); //Zeilenabstand - menuBox.setPadding(new Insets(2.5,0,0,2.5)); // abstand zum Rand - menuBox.getChildren().addAll(infoBtn, settingsBtn, streamingSettingsBtn, switchBtn, demoBtn); - menuBox.setFillWidth(true); - - AnchorPane.setTopAnchor(menuBox, 33d); - AnchorPane.setBottomAnchor(menuBox, 0d); settingsBox.setStyle("-fx-background-color: #FFFFFF;"); settingsBox.getChildren().add(settingsan); @@ -473,49 +595,16 @@ public class MainWindowController { AnchorPane.setTopAnchor(settingsBox, 34d); AnchorPane.setRightAnchor(settingsBox, 0d); AnchorPane.setBottomAnchor(settingsBox, 0d); - AnchorPane.setLeftAnchor(settingsBox, 130d); + AnchorPane.setLeftAnchor(settingsBox, 150d); AnchorPane.setTopAnchor(streamingSettingsBox, 34d); AnchorPane.setRightAnchor(streamingSettingsBox, 0d); AnchorPane.setBottomAnchor(streamingSettingsBox, 0d); - AnchorPane.setLeftAnchor(streamingSettingsBox, 130d); + AnchorPane.setLeftAnchor(streamingSettingsBox, 150d); ta1.setWrapText(true); ta1.setEditable(false); ta1.setFont(Font.font("System", getSize())); - - image1.setImage(imHF); - - //TODO kann das auch raus? - tfsearch.textProperty().addListener(new ChangeListener() { - @SuppressWarnings("unchecked") - @Override - public void changed(ObservableValue observable,String oldValue, String newValue) { - int counter = newDaten.size(); - filterData.removeAll(filterData); - root.getChildren().remove(0,root.getChildren().size()); - - for(int i = 0; i < counter; i++){ - if(newDaten.get(i).getTitel().toLowerCase().contains(tfsearch.getText().toLowerCase())){ - filterData.add(newDaten.get(i)); - } - } - - for(int i = 0; i < filterData.size(); i++){ - root.getChildren().addAll(new TreeItem(filterData.get(i))); //fügt daten zur Rootnode hinzu - } - } - }); - - //TODO das auch? - cbLocal.getSelectionModel().selectedIndexProperty() - .addListener(new ChangeListener() { - public void changed(ObservableValue ov, Number value, Number new_value) { - setLocal(new_value.intValue()); - setLoaclUI(local); - saveSettings(); - } - }); } //initialisierung der Tabellen für filme(beide Modi) und Streaming-Settings @@ -582,169 +671,37 @@ public class MainWindowController { } //initialisierung der Button Actions - private void initBtnAction(){ + private void initActions(){ - infoBtn.setOnAction(new EventHandler(){ - @Override - public void handle(ActionEvent event) { - Alert alert = new Alert(AlertType.INFORMATION); - alert.setTitle("Info"); - alert.setHeaderText("Project HomeFlix"); - alert.setContentText(infoText); - alert.showAndWait(); - } - }); - - //setteingsbtn clicked, deklarieren der actions der Objekte die bei settingsbtn angezeigt werden - settingsBtn.setOnAction(new EventHandler() { + //TODO unterscheiden zwischen streaming und local + tfsearch.textProperty().addListener(new ChangeListener() { + @SuppressWarnings("unchecked") @Override - public void handle(ActionEvent event){ - if(settingstrue == false){ - anpane.getChildren().addAll(settingsBox); - - tfPfad.setOnAction(new EventHandler(){ - @Override - public void handle(ActionEvent event){ - setPath(tfPfad.getText()); - saveSettings(); - } - }); - directoryBtn.setOnAction(new EventHandler() { - @Override - public void handle(ActionEvent event){ - selectedFolder = directoryChooser.showDialog(null); - if(selectedFolder == null){ - System.out.println("No Directory selected"); - }else{ - setPath(selectedFolder.getAbsolutePath()); - saveSettings(); - tfPfad.setText(getPath()); - try { - Runtime.getRuntime().exec("java -jar ProjectHomeFlix.jar"); //starte neu - System.exit(0); //beendet sich selbst - } catch (IOException e) { - System.out.println("es ist ein Fehler aufgetreten"); - e.printStackTrace(); - } - } - } - }); - mainColor.setOnAction(new EventHandler(){ - @Override - public void handle(ActionEvent event){ - editColor(mainColor.getValue().toString()); - applyColor(); - } - }); - sl1.valueProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue ov,Number old_val, Number new_val) { - setSize(sl1.getValue()); - ta1.setFont(Font.font("System", size)); - saveSettings(); - } - }); - - //updater - updateBtn.setOnAction(new EventHandler() { - @Override - public void handle(ActionEvent event){ - update(); - } - }); - autoupdateBtn.setOnAction(new EventHandler(){ - @Override - public void handle(ActionEvent event) { - if(autoUpdate.equals("0")){ - setAutoUpdate("1"); - saveSettings(); - }else{ - setAutoUpdate("0"); - saveSettings(); - } - } - }); - - settingstrue = true; - }else{ - anpane.getChildren().removeAll(settingsBox); - setPath(tfPfad.getText()); - saveSettings(); - settingstrue = false; - } - } - }); - - //demoBtn clicked debbuging - demoBtn.setOnAction(new EventHandler(){ - @Override - public void handle(ActionEvent event) { - /** - * TODO DBController - */ -// loadData(); - } - }); - - streamingSettingsBtn.setOnAction(new EventHandler() { - @Override - public void handle(ActionEvent event){ - if(streamingSettingsTrue == false){ - anpane.getChildren().addAll(streamingSettingsBox); - - streamingDirectoryBtn.setOnAction(new EventHandler() { - - @Override - public void handle(ActionEvent event) { - selectedStreamingFolder = directoryChooser.showDialog(null); - if(selectedStreamingFolder == null){ - System.out.println("No Directory selected"); - }else{ - setStreamingPath(selectedStreamingFolder.getAbsolutePath()); - saveSettings(); - streamingtfPfad.setText(getStreamingPath()); - try { - Runtime.getRuntime().exec("java -jar ProjectHomeFlix.jar"); //starte neu - System.exit(0); //beendet sich selbst - } catch (IOException e) { - System.out.println("es ist ein Fehler aufgetreten"); - e.printStackTrace(); - } - } - } - });; - - streamingSettingsTrue = true; - }else{ - anpane.getChildren().removeAll(streamingSettingsBox); - streamingSettingsTrue = false; - } - - } - }); - - /** - * TODO menu wieder verschwinden lassen - * TODO Banner zurück auf homeflix setzen - */ - switchBtn.setOnAction(new EventHandler() { - - @Override - public void handle(ActionEvent event) { - - if(mode.equals("local")){ //switch to streaming mode - setMode("streaming"); - switchBtn.setText("local"); - }else if(mode.equals("streaming")){ //switch to local mode - setMode("local"); - switchBtn.setText("streaming"); - } - saveSettings(); - root.getChildren().remove(0,root.getChildren().size()); - addDataUI(); - - } - }); + public void changed(ObservableValue observable,String oldValue, String newValue) { + int counter = newDaten.size(); + filterData.removeAll(filterData); + root.getChildren().remove(0,root.getChildren().size()); + + for(int i = 0; i < counter; i++){ + if(newDaten.get(i).getTitel().toLowerCase().contains(tfsearch.getText().toLowerCase())){ + filterData.add(newDaten.get(i)); + } + } + + for(int i = 0; i < filterData.size(); i++){ + root.getChildren().addAll(new TreeItem(filterData.get(i))); //fügt daten zur Rootnode hinzu + } + } + }); + + cbLocal.getSelectionModel().selectedIndexProperty() + .addListener(new ChangeListener() { + public void changed(ObservableValue ov, Number value, Number new_value) { + setLocal(new_value.intValue()); + setLoaclUI(local); + saveSettings(); + } + }); } //prüft auf Update und fürht es gegebenenfalls aus @@ -846,13 +803,6 @@ public class MainWindowController { } } } -// }else{ -// Alert alert = new Alert(AlertType.ERROR); -// alert.setHeaderText(""); -// alert.setTitle("Error"); -// alert.setContentText("Oh, something went wrong! It seems someone has used a wrong mode. Please contact the maintainer!"); -// alert.showAndWait(); -// } } public void addDataUI(){ @@ -913,8 +863,8 @@ public class MainWindowController { BigInteger icolor = new BigInteger(getColor(),16); BigInteger ccolor = new BigInteger("78909cff",16); - menuBox.setStyle(style); - topVBox.setStyle(style); + sideMenuVBox.setStyle(style); + topHBox.setStyle(style); tfsearch.setFocusColor(Color.valueOf(getColor())); tfPfad.setFocusColor(Color.valueOf(getColor())); @@ -923,7 +873,7 @@ public class MainWindowController { streamingSettingsBtn.setStyle("-fx-text-fill: WHITE;"); switchBtn.setStyle("-fx-text-fill: WHITE;"); infoBtn.setStyle("-fx-text-fill: WHITE;"); - demoBtn.setStyle("-fx-text-fill: WHITE;"); + debugBtn.setStyle("-fx-text-fill: WHITE;"); directoryBtn.setStyle(btnStylewhite); streamingDirectoryBtn.setStyle(btnStyle); updateBtn.setStyle(btnStylewhite); @@ -937,7 +887,7 @@ public class MainWindowController { streamingSettingsBtn.setStyle("-fx-text-fill: BLACK;"); switchBtn.setStyle("-fx-text-fill: BLACK;"); infoBtn.setStyle("-fx-text-fill: BLACK;"); - demoBtn.setStyle("-fx-text-fill: BLACK;"); + debugBtn.setStyle("-fx-text-fill: BLACK;"); directoryBtn.setStyle(btnStyle); streamingDirectoryBtn.setStyle(btnStyle); updateBtn.setStyle(btnStyle); @@ -950,7 +900,7 @@ public class MainWindowController { //das solte weg kann aber hier bleiben wicht ist dass es zum selben zeitpunkt wie aply color ausgeführt wird if(mode.equals("local")){ - switchBtn.setText("streaming"); + switchBtn.setText("streaming"); //TODO translate }else if(mode.equals("streaming")){ switchBtn.setText("local"); } @@ -967,8 +917,9 @@ public class MainWindowController { default:bundle = ResourceBundle.getBundle("recources.HomeFlix-Local", Locale.US); //default local break; } - settingsBtn.setText(bundle.getString("settings")); infoBtn.setText(bundle.getString("info")); + settingsBtn.setText(bundle.getString("settings")); + streamingSettingsBtn.setText(bundle.getString("streamingSettings")); playbtn.setText(bundle.getString("play")); openfolderbtn.setText(bundle.getString("openFolder")); updateBtn.setText(bundle.getString("checkUpdates")); @@ -978,12 +929,17 @@ public class MainWindowController { versionlbl.setText(bundle.getString("version")+" "+version); columnTitel.setText(bundle.getString("columnName")); columnRating.setText(bundle.getString("columnRating")); - columnStreamUrl.setText(bundle.getString("columnDatName")); + columnStreamUrl.setText(bundle.getString("columnStreamUrl")); + columnResolution.setText(bundle.getString("columnResolution")); + columnSeason.setText(bundle.getString("columnSeason")); + columnYear.setText(bundle.getString("columnYear")); errorUpdateD = bundle.getString("errorUpdateD"); errorUpdateV = bundle.getString("errorUpdateV"); + errorPlay = bundle.getString("errorPlay"); + errorOpenStream = bundle.getString("errorOpenStream"); + errorMode = bundle.getString("errorMode"); infoText = bundle.getString("version")+" "+version+" plasma bucket"+bundle.getString("infoText"); linuxBugText = bundle.getString("linuxBug"); - errorPlay = bundle.getString("errorPlay"); vlcNotInstalled = bundle.getString("vlcNotInstalled"); } diff --git a/src/recources/HomeFlix-Local_de_DE.properties b/src/recources/HomeFlix-Local_de_DE.properties index 6458573..70596a0 100644 --- a/src/recources/HomeFlix-Local_de_DE.properties +++ b/src/recources/HomeFlix-Local_de_DE.properties @@ -1,6 +1,7 @@ # HomeFlix-Local_de_DE.properties German Local info = Info settings = Einstellungen +streamingSettings = Stream Einst. play = play openFolder = Ordner \u00F6ffnen chooseFolder = Ordner ausw\u00E4hlen @@ -10,10 +11,15 @@ autoUpdate = beim Start nach Updates suchen: version = Version: columnName = Name columnRating = Bewertung -columnDatName = Datei Name +columnStreamUrl = Datei Name +columnResolution = Aufl\u00F6sung +columnSeason = Staffel +columnYear = Jahr 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 +errorMode = Oh, da lief etwas falsch! Da hat jemand einen falschen Modus verwendet. \nError: mode unknow (muk)\nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz +errorOpenStream = Beim \u00F6ffnen des Streams ist ein Fehler aufgetreten! linuxBug = Zurzeit werden unter Linux leider keine Dateien mit Leerzeichen unterst\u00FCtzt! 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 Kellerkinder www.kellerkinder.xyz diff --git a/src/recources/HomeFlix-Local_en_US.properties b/src/recources/HomeFlix-Local_en_US.properties index 857b80b..e1d49f6 100644 --- a/src/recources/HomeFlix-Local_en_US.properties +++ b/src/recources/HomeFlix-Local_en_US.properties @@ -1,6 +1,7 @@ # HomeFlix-Local_en_US.properties US-English Local and default info = Info settings = Settings +streamingSettings = Stream Settings play = play openFolder = open Folder chooseFolder = choose Directory @@ -10,10 +11,15 @@ autoUpdate = check at startup for updates: version = Version: columnName = Name columnRating = Rating -columnDatName = File Name +columnStreamUrl = File Name +columnResolution = Resolution +columnSeason = Season +columnYear = Year 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 +errorMode = Oh, something went wrong! It seems someone has used a wrong mode. \nError: mode unknow (muk) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz +errorOpenStream = An error has occurred during opening the stream! linuxBug = Currently no files are supported with additional space under Linux unfortunately! vlcNotInstalled = VLC Media Player is required to play a movie! infoText = \nMaintainer: seilo@kellerkinder.xyz and \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz