From 9de3e6a3f155a033aa9b38ade2047dd56531d3a8 Mon Sep 17 00:00:00 2001 From: Seil0 Date: Sun, 9 Oct 2016 18:35:55 +0200 Subject: [PATCH] code cleanup part 2 --- bin/application/MainWindow.fxml | 30 +- bin/application/MainWindowController$1.class | Bin 1184 -> 2452 bytes bin/application/MainWindowController$10.class | Bin 1573 -> 0 bytes bin/application/MainWindowController$2.class | Bin 2199 -> 2590 bytes bin/application/MainWindowController$3.class | Bin 1305 -> 1571 bytes bin/application/MainWindowController$4.class | Bin 2027 -> 2032 bytes bin/application/MainWindowController$5.class | Bin 976 -> 0 bytes bin/application/MainWindowController$6.class | Bin 1276 -> 0 bytes bin/application/MainWindowController$7.class | Bin 2235 -> 0 bytes bin/application/MainWindowController$8.class | Bin 2461 -> 0 bytes bin/application/MainWindowController$9.class | Bin 2590 -> 0 bytes bin/application/MainWindowController.class | Bin 36783 -> 34985 bytes bin/recources/HomeFlix-Local_de_DE.properties | 1 + bin/recources/HomeFlix-Local_en_US.properties | 1 + src/application/MainWindow.fxml | 30 +- src/application/MainWindowController.java | 340 +++++++----------- src/recources/HomeFlix-Local_de_DE.properties | 1 + src/recources/HomeFlix-Local_en_US.properties | 1 + 18 files changed, 190 insertions(+), 214 deletions(-) delete mode 100644 bin/application/MainWindowController$10.class delete mode 100644 bin/application/MainWindowController$5.class delete mode 100644 bin/application/MainWindowController$6.class delete mode 100644 bin/application/MainWindowController$7.class delete mode 100644 bin/application/MainWindowController$8.class delete mode 100644 bin/application/MainWindowController$9.class diff --git a/bin/application/MainWindow.fxml b/bin/application/MainWindow.fxml index 66c273a..769cf66 100644 --- a/bin/application/MainWindow.fxml +++ b/bin/application/MainWindow.fxml @@ -1,8 +1,14 @@ + + + + + + @@ -38,7 +44,7 @@ - + @@ -67,5 +73,25 @@ + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/bin/application/MainWindowController$1.class b/bin/application/MainWindowController$1.class index af86c65935240a5da79e109b2cb84382732da41e..08c339da7fa86863d265f8e0bb1a91d0eaa5abfa 100644 GIT binary patch literal 2452 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 diff --git a/bin/application/MainWindowController$2.class b/bin/application/MainWindowController$2.class index 5c4ee4883d95d599f0b73d285765de1677c62c60..2dd013efb8602e4226aba50f766ca1862dc627f7 100644 GIT binary patch literal 2590 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 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 diff --git a/bin/application/MainWindowController$4.class b/bin/application/MainWindowController$4.class index cafd2e069314433d46c9101e9bc8e96f37eab6d1..b4114d4040c00c1e3a7d430f0784d61917e0022f 100644 GIT binary patch delta 100 zcmV-q0Gt2o5AYALJpvC7b8Km3WpYMuZgf*=dS#PA0^|iZ0RToQlOO>hlS>0U3JGCj zV`X!5Br!CzkORa53=3&)X>>tjbZKvHbCYKVR{{cOlfVXW4gzWb6as4iDgtZ(F#>Iq GJ_oH-I35cC delta 87 zcmV-d0I2`)59<%GJpu#+b8In_OakNqG?Os{VF?IfV`F7=b0jshoCCxH6B2V}baZKM tXLCYyZewg|V{2t(lWYc80s)Vc#RhN=0g?a|0h0hK0h9nS0hN2gEZUg_t!#Bo$R`*}FS?=FFM1`}5bg?*Q(iZ6QNg7e_~d@htf+d7Q>qZLarD3vIxRi2Nnu8vM4zyqD;s(44~9kT0WV)8p`OI z7zUD1>4%;O1|m{sJq_lJOoF?xs=H}qj??xCYmNR~?>nAxFm<5Y9N4I0)k2L>U(~yU z%diOr;dwHS-Ft+k)J?+b=@keoC+h#LY@tr5o+iy^zt$aG!ZN`=2q%#zA1Px^?SDsq z+t3h-2Wq56GKmu}l&U z#t#$TSKdqM6P!J*Wz-8q9LpGWZX?Uz5~y4@r_UEU%U=}{U2SPA*QsEV<0))NM|lK((xv4rO_%HXz|RnX)^fv E4MM-_e*gdg diff --git a/bin/application/MainWindowController$6.class b/bin/application/MainWindowController$6.class deleted file mode 100644 index 3c55e27546693aded7e9e4a02739424008c0e2bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1276 zcma)5TTc@~6#k|y^x|r3ky21D)}p;A1&T#2l2n3`r07Ex6W@mI2n*|O-JPO;!Jpuh zi8tb-iB{u-@!20`JhNS5Yb13yyE}8{T)yu+XMg_s_8q_yR>KG|WO%D(8akJTZIw2; zVLddgru}Tqwxna5rf{;AFhUH8J$}GTCbxD<_qO+hF2fjR7+2QE&r9M!ShBRP-gmgw zq%ekIxof!Dc`8vKRHI7XD~4srRfgHzVE6nMLuk!ziYORPY6v3|LlAKdQ6w0GIpq+q z8e+%=rVIfe+=b>X_%WroWCDBxA^_M;&k!`i7vFvY;;W0*lEjPrdh>$+&T zfGlwkPutui&ZAupyF{ISqLfNMcvWT3gx=T1_rV$i6_oe3$fP4OdhP zG?yQUhLDnwQKcboKo};D7mcbkB-i&hdCTw2*k2MKi5o_lA$^?sF&c@h8b*;~h&AlC zql?>y>i+n@rh87MVTd-29gEAhLw*}Q(soC^+K;+-%vbu4dZ%EO#wEUP>89=_zwd(z&7UizZ37VOhdiGr8*umzqd(OwSNlBB2JH{@EZsQ7D2ZXmt$% zx`9}s_!(N^3r>BcT>z(*%{!rJ_6kYbYZRlbBRE4}Y9La6mKT1Oa^VxSuNX^Cb};=C zDYZ?`c5q28Iw&4u#52+Hkx7*cdgZ1FAlPff*&C$UTTHWe$guY)vO_Gg4<3Y+2dV5s z0Lqv{i9pO#mJkA&c%nwI7JOKFA6B$b{DH*|mi}-XCKts)@lyOlsCcVoQbbv<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 diff --git a/bin/application/MainWindowController$8.class b/bin/application/MainWindowController$8.class deleted file mode 100644 index 7a65d9287d3dcdb269fc7b5a7fb00ddad624bec5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/bin/application/MainWindowController$9.class b/bin/application/MainWindowController$9.class deleted file mode 100644 index 2e63ccbec8e205520592d625fbf36dafe12d066c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class index 748f658548629b302bb0e75aa2402f6db885109c..e66b3f0f0032a51f9129c6a5707ccbc22ff67f39 100644 GIT binary patch literal 34985 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 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 diff --git a/bin/recources/HomeFlix-Local_de_DE.properties b/bin/recources/HomeFlix-Local_de_DE.properties index 70596a0..6ddfe46 100644 --- a/bin/recources/HomeFlix-Local_de_DE.properties +++ b/bin/recources/HomeFlix-Local_de_DE.properties @@ -3,6 +3,7 @@ info = Info settings = Einstellungen streamingSettings = Stream Einst. play = play +tfPath = Pfad... openFolder = Ordner \u00F6ffnen chooseFolder = Ordner ausw\u00E4hlen fontSize = Schriftgr\u00F6\u00DFe: diff --git a/bin/recources/HomeFlix-Local_en_US.properties b/bin/recources/HomeFlix-Local_en_US.properties index e1d49f6..128c8b7 100644 --- a/bin/recources/HomeFlix-Local_en_US.properties +++ b/bin/recources/HomeFlix-Local_en_US.properties @@ -3,6 +3,7 @@ info = Info settings = Settings streamingSettings = Stream Settings play = play +tfPath = Path... openFolder = open Folder chooseFolder = choose Directory fontSize = font size: diff --git a/src/application/MainWindow.fxml b/src/application/MainWindow.fxml index 66c273a..769cf66 100644 --- a/src/application/MainWindow.fxml +++ b/src/application/MainWindow.fxml @@ -1,8 +1,14 @@ + + + + + + @@ -38,7 +44,7 @@ - + @@ -67,5 +73,25 @@ + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index 821b639..1cbd1dc 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -63,8 +63,6 @@ import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; import javafx.collections.FXCollections; import javafx.collections.ObservableList; -import javafx.event.ActionEvent; -import javafx.event.EventHandler; import javafx.fxml.FXML; import javafx.scene.control.Alert; import javafx.scene.control.Alert.AlertType; @@ -89,21 +87,17 @@ public class MainWindowController { @FXML private AnchorPane anpane; @FXML - private AnchorPane settingsan = new AnchorPane(); + private AnchorPane settingsAnchor; @FXML - private AnchorPane streamingSettingsan = new AnchorPane(); + private AnchorPane streamingSettingsAnchor; @FXML private HBox topHBox; @FXML private VBox sideMenuVBox; @FXML - private VBox settingsBox = new VBox(); - @FXML - private VBox streamingSettingsBox = new VBox(); - @FXML private TreeTableView treeTableViewfilm; @FXML - private TableView treeViewStreamingdata = new TableView<>(); + private TableView tableViewStreamingdata; @FXML private JFXTextArea ta1; @FXML @@ -127,33 +121,33 @@ public class MainWindowController { @FXML private JFXButton debugBtn; @FXML - private JFXButton updateBtn = new JFXButton("Auf Update prüfen"); + private JFXButton updateBtn; @FXML - private JFXButton directoryBtn = new JFXButton("Ordner auswählen"); + private JFXButton directoryBtn; @FXML - private JFXButton streamingDirectoryBtn = new JFXButton("Ordner auswählen"); + private JFXButton streamingDirectoryBtn; @FXML - private JFXToggleButton autoupdateBtn = new JFXToggleButton(); + private JFXToggleButton autoupdateBtn; @FXML - public JFXTextField tfPfad = new JFXTextField(); + public JFXTextField tfPath; @FXML - public JFXTextField streamingtfPfad = new JFXTextField(); + public JFXTextField tfStreamingPath; @FXML private JFXTextField tfsearch; @FXML - public JFXColorPicker mainColor = new JFXColorPicker(); + public JFXColorPicker mainColor; @FXML - public ChoiceBox cbLocal = new ChoiceBox(); + public ChoiceBox cbLocal; @FXML - public JFXSlider sl1 = new JFXSlider(); + public JFXSlider sliderFontSize; @FXML private JFXDialog dialog = new JFXDialog(); @FXML - private Label versionlbl = new Label(); + private Label versionlbl; @FXML - private Label sizelbl = new Label("Schriftgröße:"); + private Label sizelbl; @FXML - private Label aulbl = new Label("beim starten nach Updates suchen:"); + private Label aulbl; @FXML private ImageView image1; @@ -180,7 +174,7 @@ public class MainWindowController { private TableColumn dataNameEndColumn = new TableColumn<>("Datei Name mit Endung"); - private boolean menutrue = false; //merker f�r menubtn (�ffnen oder schlie�en) + private boolean menutrue = false; //merker für menubtn (öffnen oder schließen) private boolean settingstrue = false; private boolean streamingSettingsTrue = false; private String version = "0.3.7"; @@ -240,13 +234,13 @@ public class MainWindowController { menutrue = false; } if(settingstrue == true){ - anpane.getChildren().removeAll(settingsBox); - setPath(tfPfad.getText()); + settingsAnchor.setVisible(false); + setPath(tfPath.getText()); saveSettings(); settingstrue = false; } if(streamingSettingsTrue == true){ - anpane.getChildren().removeAll(streamingSettingsBox); + streamingSettingsAnchor.setVisible(false); streamingSettingsTrue = false; } } @@ -360,75 +354,15 @@ public class MainWindowController { @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(); - } - } - }); - + if(streamingSettingsTrue == true){ + streamingSettingsAnchor.setVisible(false); + streamingSettingsTrue = false; + } + settingsAnchor.setVisible(true); settingstrue = true; }else{ - anpane.getChildren().removeAll(settingsBox); - setPath(tfPfad.getText()); + settingsAnchor.setVisible(false); + setPath(tfPath.getText()); saveSettings(); settingstrue = false; } @@ -440,32 +374,14 @@ public class MainWindowController { @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(); - } - } - } - }); - + if(settingstrue == true){ + settingsAnchor.setVisible(false); + settingstrue = false; + } + streamingSettingsAnchor.setVisible(true); streamingSettingsTrue = true; }else{ - anpane.getChildren().removeAll(streamingSettingsBox); + streamingSettingsAnchor.setVisible(false); streamingSettingsTrue = false; } } @@ -482,22 +398,95 @@ public class MainWindowController { saveSettings(); root.getChildren().remove(0,root.getChildren().size()); addDataUI(); - + settingsAnchor.setVisible(false); + streamingSettingsAnchor.setVisible(false); sideMenuVBox.setVisible(false); //disables sidemenu menutrue = false; + settingstrue = false; + streamingSettingsTrue = false; } @FXML private void debugBtnclicked(){ //for testing } + + + @FXML + private void tfPathAction(){ + setPath(tfPath.getText()); + saveSettings(); + } + + @FXML + private void directoryBtnAction(){ + selectedFolder = directoryChooser.showDialog(null); + if(selectedFolder == null){ + System.out.println("No Directory selected"); + }else{ + setPath(selectedFolder.getAbsolutePath()); + saveSettings(); + tfPath.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(); + } + } + } + + @FXML + private void mainColorAction(){ + editColor(mainColor.getValue().toString()); + applyColor(); + } + + @FXML + private void updateBtnAction(){ + update(); + } + + @FXML + private void autoupdateBtnAction(){ + if(autoUpdate.equals("0")){ + setAutoUpdate("1"); + }else{ + setAutoUpdate("0"); + } + saveSettings(); + } + + @FXML + private void tfStreamingPathAction(){ + // + } + + @FXML + private void streamingDirectoryBtnAction(){ + selectedStreamingFolder = directoryChooser.showDialog(null); + if(selectedStreamingFolder == null){ + System.out.println("No Directory selected"); + }else{ + setStreamingPath(selectedStreamingFolder.getAbsolutePath()); + saveSettings(); + tfStreamingPath.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(); + } + } + } + //"Main" Methode die beim start von der Klasse Main aufgerufen wird, initialiesirung der einzellnen UI-Objekte - @SuppressWarnings({ "static-access"}) public void setMain(Main main) { loadSettings(); -// loadStreamingSettings(); initTabel(); initActions(); @@ -505,33 +494,15 @@ public class MainWindowController { debugBtn.setDisable(true); //debugging btn for tests debugBtn.setVisible(false); - - tfPfad.setPrefWidth(250); - tfPfad.setPromptText("Pfad"); - tfPfad.setText(getPath()); - streamingtfPfad.setPrefWidth(250); - streamingtfPfad.setPromptText("Pfad"); - streamingtfPfad.setText(getStreamingPath()); + tfPath.setText(getPath()); - sl1.setMaxWidth(250); - sl1.setMin(2); - sl1.setMax(48); - sl1.setValue(getSize()); + sliderFontSize.setValue(getSize()); cbLocal.setItems(locals); updateBtn.setFont(Font.font("System", 12)); - directoryBtn.setFont(Font.font("System", 12)); - directoryBtn.setMaxSize(180, 25); - - streamingDirectoryBtn.setFont(Font.font("System", 12)); - streamingDirectoryBtn.setMaxSize(180, 25); - - treeViewStreamingdata.setPrefHeight(533); - treeViewStreamingdata.setPrefWidth(370); - if(autoUpdate.equals("1")){ autoupdateBtn.setSelected(true); update(); @@ -540,68 +511,7 @@ public class MainWindowController { } versionlbl.setText("Version: "+version); - - settingsBox.setStyle("-fx-background-color: #FFFFFF;"); - settingsBox.getChildren().add(settingsan); - - streamingSettingsBox.setStyle("-fx-background-color: #FFFFFF;"); - streamingSettingsBox.getChildren().add(streamingSettingsan); - - settingsan.getChildren().addAll(tfPfad, directoryBtn, mainColor, sizelbl, sl1, cbLocal, updateBtn, aulbl, autoupdateBtn, versionlbl); - - settingsan.setTopAnchor(tfPfad, 5d); - settingsan.setLeftAnchor(tfPfad, 5d); - - settingsan.setTopAnchor(directoryBtn, 5d); - settingsan.setLeftAnchor(directoryBtn, 260d); - - settingsan.setTopAnchor(mainColor, 40d); - settingsan.setLeftAnchor(mainColor, 5d); - - settingsan.setTopAnchor(sizelbl, 75d); - settingsan.setLeftAnchor(sizelbl, 5d); - - settingsan.setTopAnchor(sl1, 110d); - settingsan.setLeftAnchor(sl1, 5d); - - settingsan.setTopAnchor(cbLocal, 145d); - settingsan.setLeftAnchor(cbLocal, 5d); - - settingsan.setTopAnchor(updateBtn, 180d); - settingsan.setLeftAnchor(updateBtn, 5d); - - settingsan.setTopAnchor(aulbl, 215d); - settingsan.setLeftAnchor(aulbl, 5d); - - settingsan.setTopAnchor(autoupdateBtn, 230d); - settingsan.setLeftAnchor(autoupdateBtn, 5d); - - settingsan.setTopAnchor(versionlbl, 280d); - settingsan.setLeftAnchor(versionlbl, 5d); - - streamingSettingsan.getChildren().addAll(streamingtfPfad, streamingDirectoryBtn,treeViewStreamingdata); - - streamingSettingsan.setTopAnchor(streamingtfPfad, 5d); - streamingSettingsan.setLeftAnchor(streamingtfPfad, 5d); - - streamingSettingsan.setTopAnchor(streamingDirectoryBtn, 5d); - streamingSettingsan.setLeftAnchor(streamingDirectoryBtn, 260d); - - streamingSettingsan.setTopAnchor(treeViewStreamingdata, 40d); - streamingSettingsan.setLeftAnchor(treeViewStreamingdata, 5d); - streamingSettingsan.setBottomAnchor(treeViewStreamingdata, 5d); - - - AnchorPane.setTopAnchor(settingsBox, 34d); - AnchorPane.setRightAnchor(settingsBox, 0d); - AnchorPane.setBottomAnchor(settingsBox, 0d); - AnchorPane.setLeftAnchor(settingsBox, 150d); - - AnchorPane.setTopAnchor(streamingSettingsBox, 34d); - AnchorPane.setRightAnchor(streamingSettingsBox, 0d); - AnchorPane.setBottomAnchor(streamingSettingsBox, 0d); - AnchorPane.setLeftAnchor(streamingSettingsBox, 150d); - + ta1.setWrapText(true); ta1.setEditable(false); ta1.setFont(Font.font("System", getSize())); @@ -611,12 +521,12 @@ public class MainWindowController { @SuppressWarnings({ "unchecked", "rawtypes" }) private void initTabel(){ - //Filmtabelle -// root.setExpanded(true); - + //Filmtabelle columnRating.setMaxWidth(120); columnTitel.setMaxWidth(240); columnStreamUrl.setMaxWidth(0); + dataNameColumn.setPrefWidth(130); + dataNameEndColumn.setPrefWidth(170); treeTableViewfilm.setRoot(root); treeTableViewfilm.setColumnResizePolicy( TreeTableView.CONSTRAINED_RESIZE_POLICY ); @@ -662,12 +572,11 @@ public class MainWindowController { }); //Streaming-Settings Tabelle - dataNameColumn.setCellValueFactory(cellData -> cellData.getValue().titelProperty()); dataNameEndColumn.setCellValueFactory(cellData -> cellData.getValue().streamUrlProperty()); - treeViewStreamingdata.getColumns().addAll(dataNameColumn, dataNameEndColumn); - treeViewStreamingdata.setItems(streamingData); + tableViewStreamingdata.getColumns().addAll(dataNameColumn, dataNameEndColumn); + tableViewStreamingdata.setItems(streamingData); } //initialisierung der Button Actions @@ -702,11 +611,19 @@ public class MainWindowController { saveSettings(); } }); + + sliderFontSize.valueProperty().addListener(new ChangeListener() { + @Override + public void changed(ObservableValue ov,Number old_val, Number new_val) { + setSize(sliderFontSize.getValue()); + ta1.setFont(Font.font("System", size)); + saveSettings(); + } + }); } //prüft auf Update und fürht es gegebenenfalls aus private void update(){ - System.out.println("check for updates ..."); try { URL url = new URL(versionURL); //URL der Datei mit aktueller Versionsnummer @@ -866,7 +783,7 @@ public class MainWindowController { sideMenuVBox.setStyle(style); topHBox.setStyle(style); tfsearch.setFocusColor(Color.valueOf(getColor())); - tfPfad.setFocusColor(Color.valueOf(getColor())); + tfPath.setFocusColor(Color.valueOf(getColor())); if(icolor.compareTo(ccolor) == -1){ settingsBtn.setStyle("-fx-text-fill: WHITE;"); @@ -921,9 +838,12 @@ public class MainWindowController { settingsBtn.setText(bundle.getString("settings")); streamingSettingsBtn.setText(bundle.getString("streamingSettings")); playbtn.setText(bundle.getString("play")); + tfPath.setPromptText(bundle.getString("tfPath")); + tfStreamingPath.setPromptText(bundle.getString("tfPath")); openfolderbtn.setText(bundle.getString("openFolder")); 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); @@ -1119,7 +1039,7 @@ public class MainWindowController { ta1.appendText("Titel: "+titel+"\n"); ta1.appendText("Jahr: "+ year+"\n"); ta1.appendText("Einstufung: "+rated+"\n"); - ta1.appendText("Ver�ffentlicht am: "+released+"\n"); + ta1.appendText("Veröffentlicht am: "+released+"\n"); ta1.appendText("Laufzeit: "+runtime+"\n"); ta1.appendText("Genre: "+genre+"\n"); ta1.appendText("Regisseur: "+director+"\n"); diff --git a/src/recources/HomeFlix-Local_de_DE.properties b/src/recources/HomeFlix-Local_de_DE.properties index 70596a0..6ddfe46 100644 --- a/src/recources/HomeFlix-Local_de_DE.properties +++ b/src/recources/HomeFlix-Local_de_DE.properties @@ -3,6 +3,7 @@ info = Info settings = Einstellungen streamingSettings = Stream Einst. play = play +tfPath = Pfad... openFolder = Ordner \u00F6ffnen chooseFolder = Ordner ausw\u00E4hlen fontSize = Schriftgr\u00F6\u00DFe: diff --git a/src/recources/HomeFlix-Local_en_US.properties b/src/recources/HomeFlix-Local_en_US.properties index e1d49f6..128c8b7 100644 --- a/src/recources/HomeFlix-Local_en_US.properties +++ b/src/recources/HomeFlix-Local_en_US.properties @@ -3,6 +3,7 @@ info = Info settings = Settings streamingSettings = Stream Settings play = play +tfPath = Path... openFolder = open Folder chooseFolder = choose Directory fontSize = font size: