From 4145a09b5dc51c0eb7a79c9c2d2655c8738dc0ce Mon Sep 17 00:00:00 2001 From: Seil0 Date: Sun, 14 Aug 2016 16:03:36 +0200 Subject: [PATCH] update to version 0.3.5 --- .gitignore | 2 ++ .../HomeFlix-Local_de_DE.properties | 7 ++-- .../HomeFlix-Local_en_US.properties | 3 +- bin/application/MainWindowController$1.class | Bin 1518 -> 1518 bytes .../MainWindowController$2$1.class | Bin 1319 -> 1319 bytes .../MainWindowController$2$2.class | Bin 2351 -> 2351 bytes .../MainWindowController$2$3.class | Bin 1440 -> 1440 bytes .../MainWindowController$2$4.class | Bin 2215 -> 2215 bytes .../MainWindowController$2$5.class | Bin 1146 -> 1146 bytes .../MainWindowController$2$6.class | Bin 1418 -> 1418 bytes bin/application/MainWindowController$2.class | Bin 3218 -> 3218 bytes bin/application/MainWindowController$3.class | Bin 940 -> 940 bytes bin/application/MainWindowController$4.class | Bin 2607 -> 2607 bytes bin/application/MainWindowController$5.class | Bin 1591 -> 1591 bytes bin/application/MainWindowController$6.class | Bin 2458 -> 2458 bytes bin/application/MainWindowController.class | Bin 28268 -> 28561 bytes bin/menu_icon_white.png | Bin 0 -> 15139 bytes config.xml | 4 +-- .../HomeFlix-Local_de_DE.properties | 7 ++-- .../HomeFlix-Local_en_US.properties | 3 +- src/application/MainWindowController.java | 32 +++++++++++------- src/menu_icon_white.png | Bin 0 -> 15139 bytes 22 files changed, 35 insertions(+), 23 deletions(-) create mode 100644 bin/menu_icon_white.png create mode 100644 src/menu_icon_white.png diff --git a/.gitignore b/.gitignore index 2ee33f6..999dfbf 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,5 @@ Temporary Items .apdisk jfoenix.jar minimal-json-0.9.4.jar +config.xml + diff --git a/bin/application/HomeFlix-Local_de_DE.properties b/bin/application/HomeFlix-Local_de_DE.properties index 50ed795..b45c53e 100644 --- a/bin/application/HomeFlix-Local_de_DE.properties +++ b/bin/application/HomeFlix-Local_de_DE.properties @@ -1,9 +1,9 @@ -# HomeFlix-Local_de_DE.properties German Local +# HomeFlix-Local_de_DE.properties German Local info = Info settings = Einstellungen play = play openFolder = Ordner \u00F6ffnen -chooseFolder = Ordner auswählen +chooseFolder = Ordner ausw\u00E4hlen fontSize = Schriftgr\u00F6\u00DFe: checkUpdates = Auf Update pr\u00FCfen autoUpdate = beim Start nach Updates suchen: @@ -11,5 +11,6 @@ version = Version: columnName = Name columnRating = Bewertung columnDatName = Datei Name -errorUpdate = Es ist ein Fehler aufgetreten! \n Um Hilfe zu erhalten besuchen Sie \nwww.kellerkinder.xyz oder support@kellerkinder.xyz +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 index 25a9919..c6eb5ca 100644 --- a/bin/application/HomeFlix-Local_en_US.properties +++ b/bin/application/HomeFlix-Local_en_US.properties @@ -11,5 +11,6 @@ version = Version: columnName = Name columnRating = Rating columnDatName = File Name -errorUpdate = An error has occurred! \n To get help, visit \n nwww.kellerkinder.xyz or support@kellerkinder.xyz +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/MainWindowController$1.class b/bin/application/MainWindowController$1.class index 7f2237ab70b3b34f5be63fe3bbb46afd8837c43c..56bcab9f0beaec6012b4047354a44c18f793b52c 100644 GIT binary patch delta 39 xcmV+?0NDTT3+@ZB=mY`4lj#Is6~h1v0K@0OSC1 Z0ObI60OkOB0OtUK0O$aP0PB;E2%!uC7ajlr delta 67 zcmV-J0KEUN60Z`lmj?mZlb8p^G1~wb0Nem20NnsB0NwyF0N(&d0N?;o0O0^=0OJ60 Z0OSC50ObIA0OkOJ0OtUO0P2&D2%!p17Z3md diff --git a/bin/application/MainWindowController$2$3.class b/bin/application/MainWindowController$2$3.class index 7c34a8b437caeff08d81120470faf9aceba18606..c5035cfca1e818da9a118b0acd9972e8f56d224a 100644 GIT binary patch delta 27 jcmZ3$y?}ee1{TJ*lQ*)&bADiuW%$UT&hTlnBx^eWj`0bo delta 27 jcmZ3$y?}ee1{TIQlQ*)&bG~PgW%$6L&hT-vBx^eWj>8G0 diff --git a/bin/application/MainWindowController$2$4.class b/bin/application/MainWindowController$2$4.class index b91a6438f389e7ef233caaa6d19596a4cb8432c0..8ddb7a57b416a91b7d4e1c8d3c6bff911a8fa83c 100644 GIT binary patch delta 31 ncmZ23xLj~U3OnPM$*JrOyx$q57=AFAG5ln3VE8rp6Z=*Gw1^A9 delta 31 ncmZ23xLj~U3OnQH$*JrOyx$n47``)@G5la~VE8%t6Z=*Gv_%WM diff --git a/bin/application/MainWindowController$2$5.class b/bin/application/MainWindowController$2$5.class index e670191cd547b555a36409405038e12359e1761f..58c4944c184dfd87fb7771af079f374ef41ddb96 100644 GIT binary patch delta 23 fcmeyx@rz@_YG%fNlh-giu`)7nF)~g5%-jwDZk-4T delta 23 fcmeyx@rz@_YG%g2lh-giu`)1lF)~j6%-jwDZh!~| diff --git a/bin/application/MainWindowController$2$6.class b/bin/application/MainWindowController$2$6.class index 8f4224d9ceb39b6ecd849029e3e058944e1dcadd..5c31ace3ba8ff60fdb4e3fc19ba4ac618cd67db2 100644 GIT binary patch delta 43 ycmeC;?&98%#=^)lIi00alAS?_k%K{wk&{7#k&8i_k(mWcqT9S1uA diff --git a/bin/application/MainWindowController$2.class b/bin/application/MainWindowController$2.class index 9769d9c51701c4f7c302215015a034566ca94969..b4cbb9e1208d65055da8001773165b474fa61b40 100644 GIT binary patch delta 82 zcmV-Y0ImO$8Il>WQVIdgvr`Hf0XfeA3INamC;-v`Isn-KOaScwUI6p}a{>g#iQr omjMv~p8*m8q5%^CzyTBh(E$|z*Z~#*-~kwuqzj1w%#$t*WUfROOaK4? delta 82 zcmV-Y0ImO$8Il>WQVIdfvr`Hf0Xfb93INXlC;-s_Isn)JOaSZvUI6m|a{&DSg#iNq omjMs}p8*j7q5%>BzyT8g(E$_y*Z~y)-~kttqzj1w%abk)WUH(eI{*Lx diff --git a/bin/application/MainWindowController$3.class b/bin/application/MainWindowController$3.class index b3eb02067bf9df192ecfc76a288789b840985edb..31aa30d550138f739d316c9ecbffb40dd41a9dc7 100644 GIT binary patch delta 19 bcmZ3(zJ`6nXC_9O$zPZ(7?mgMGS>qDMjQrE delta 19 bcmZ3(zJ`6nXC_AJ$zPZ(7?mdLGS>qDMhpf{ diff --git a/bin/application/MainWindowController$4.class b/bin/application/MainWindowController$4.class index 91832b34897bcba1875c8e84aff2614a28eded91..2866a0871d623ed1331aa3dba1816e545a7de3fd 100644 GIT binary patch delta 60 zcmZ24vR-5ZD+lBD&1@V>jGDU{_!##vC^7D3aAe%i;Ldn}p^)()LqCu`lkq6Se8yu8 P=YaGh#uJkRIqv}g1jG`_ delta 60 zcmZ24vR-5ZD+lAY&1@V>jGDU`_!xIHC^7C~aAe%a;Lf<8p^)(aLqCu`lko_{e8!^; P=YaGh#^aL%Iqv}g1AP*` diff --git a/bin/application/MainWindowController$5.class b/bin/application/MainWindowController$5.class index 1380ab2896abaaa504979e61f7493fdcbb910861..1b07de01dc74f666c5bbca63ea1e6998a59b69b7 100644 GIT binary patch delta 31 ncmdnavz=#y3@hWA$+D~oyyqCW8P79FGG1U%V7xfFi*+pkm}&`| delta 31 ncmdnavz=#y3@hX5$+D~oyk{A>8P73DGM;BpV7xH7i*+pkm?sIA diff --git a/bin/application/MainWindowController$6.class b/bin/application/MainWindowController$6.class index 57aa192d12307d8b5a27db7299f38914c2fd7754..67e61fa191077014dd788fbae70f5fbbd971ce33 100644 GIT binary patch delta 51 zcmV-30L=fI6PgpSGYA3jlQam=A@u+h0rmhS0rvnj0r&t<0r>!G0r~)T0s8=i0sH`u J0sfOD33kK-5u^YB delta 51 zcmV-30L=fI6PgpSGYA3ilQam=A@l$g0rdbR0rmhi0rvn;0r&uF0r>!S0r~)h0s8=t J0sWIC33kI95t;x1 diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class index 1cab0b012a0709457711c6e67c1fc1d91a2a0d7d..2a0ba97b62302ee55c107da688595019f269af3a 100644 GIT binary patch literal 28561 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 literal 28268 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�D^{MKH1HIu@3Qu11!23>u7$EzlB= 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 literal 0 HcmV?d00001 diff --git a/config.xml b/config.xml index ada16c4..54ad54a 100644 --- a/config.xml +++ b/config.xml @@ -2,9 +2,9 @@ Project HomeFlix settings -ee3523 0 -12.0 +ee3523 1 +12.0 C:\Users\Jannik\Videos\Beispielfilme diff --git a/src/application/HomeFlix-Local_de_DE.properties b/src/application/HomeFlix-Local_de_DE.properties index 50ed795..b45c53e 100644 --- a/src/application/HomeFlix-Local_de_DE.properties +++ b/src/application/HomeFlix-Local_de_DE.properties @@ -1,9 +1,9 @@ -# HomeFlix-Local_de_DE.properties German Local +# HomeFlix-Local_de_DE.properties German Local info = Info settings = Einstellungen play = play openFolder = Ordner \u00F6ffnen -chooseFolder = Ordner auswählen +chooseFolder = Ordner ausw\u00E4hlen fontSize = Schriftgr\u00F6\u00DFe: checkUpdates = Auf Update pr\u00FCfen autoUpdate = beim Start nach Updates suchen: @@ -11,5 +11,6 @@ version = Version: columnName = Name columnRating = Bewertung columnDatName = Datei Name -errorUpdate = Es ist ein Fehler aufgetreten! \n Um Hilfe zu erhalten besuchen Sie \nwww.kellerkinder.xyz oder support@kellerkinder.xyz +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 index 25a9919..c6eb5ca 100644 --- a/src/application/HomeFlix-Local_en_US.properties +++ b/src/application/HomeFlix-Local_en_US.properties @@ -11,5 +11,6 @@ version = Version: columnName = Name columnRating = Rating columnDatName = File Name -errorUpdate = An error has occurred! \n To get help, visit \n nwww.kellerkinder.xyz or support@kellerkinder.xyz +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/MainWindowController.java b/src/application/MainWindowController.java index cc4e46c..231ece3 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -147,11 +147,12 @@ public class MainWindowController { private boolean menutrue = false; //merker für menubtn (öffnen oder schließen) private boolean settingstrue = false; private String version = "0.3.5"; - private String versionURL = "https://raw.githubusercontent.com/Seil0/Project-HomeFlix/master/version"; - private String downloadLink = ""; - private String updateDataURL = "https://raw.githubusercontent.com/Seil0/Project-HomeFlix/master/ProjectHomeFlix.jar"; + private String versionURL = "https://raw.githubusercontent.com/Seil0/Project-HomeFlix/master/updates/version.txt"; + private String downloadLink = "https://raw.githubusercontent.com/Seil0/Project-HomeFlix/master/updates/downloadLink.txt"; - private String errorUpdate; + private String updateDataURL; + private String errorUpdateD; + private String errorUpdateV; private String infoText; private String aktVersion; private String path; @@ -172,7 +173,7 @@ public class MainWindowController { private ObservableList locals = FXCollections.observableArrayList("english", "deutsch"); private Image imHF = new Image("Homeflix_Poster.png"); private ImageView menu_icon_black = new ImageView(new Image("menu_icon_black.png")); -// private ImageView menu_icon_white = new ImageView(new Image("menu_icon_white.png")); + private ImageView menu_icon_white = new ImageView(new Image("menu_icon_white.png")); private DirectoryChooser directoryChooser = new DirectoryChooser(); Properties props = new Properties(); @@ -522,7 +523,11 @@ public class MainWindowController { aktVersion = in.readLine(); //schreibt inputstream in String in.close(); } catch (IOException e1) { - // Auto-generated catch block + Alert alert = new Alert(AlertType.ERROR); + alert.setTitle("Error"); + alert.setHeaderText(""); + alert.setContentText(errorUpdateV); + alert.showAndWait(); e1.printStackTrace(); } System.out.println("Version: "+version+", Update: "+aktVersion); @@ -541,7 +546,7 @@ public class MainWindowController { URL website; URL downloadURL = new URL(downloadLink); BufferedReader in = new BufferedReader(new InputStreamReader(downloadURL.openStream())); - //updateDataURL = in.readLine(); + updateDataURL = in.readLine(); website = new URL(updateDataURL); //Update URL ReadableByteChannel rbc = Channels.newChannel(website.openStream()); //öffnet neuen Stream/Channel FileOutputStream fos = new FileOutputStream("ProjectHomeFlix.jar"); //neuer fileoutputstram für ProjectHomeFLix.jar @@ -550,12 +555,12 @@ public class MainWindowController { Runtime.getRuntime().exec("java -jar ProjectHomeFlix.jar"); //starte neu System.exit(0); //beendet sich selbst } catch (IOException e) { - //Falls ein Fehler auftritt (ungetestet) + //Falls ein Fehler auftritt e.printStackTrace(); Alert alert = new Alert(AlertType.ERROR); alert.setTitle("Error"); alert.setHeaderText(""); - alert.setContentText(errorUpdate); + alert.setContentText(errorUpdateD); alert.showAndWait(); e.printStackTrace(); } @@ -610,8 +615,7 @@ public class MainWindowController { openfolderbtn.setStyle(btnStylewhite); returnBtn.setStyle(btnStylewhite); forwardBtn.setStyle(btnStylewhite); -//TODO menubtn.setGraphic(menu_icon_white); - menubtn.setGraphic(menu_icon_black); + menubtn.setGraphic(menu_icon_white); }else{ settingsBtn.setStyle("-fx-text-fill: BLACK;"); infoBtn.setStyle("-fx-text-fill: BLACK;"); @@ -641,14 +645,16 @@ public class MainWindowController { infoBtn.setText(bundle.getString("info")); playbtn.setText(bundle.getString("play")); openfolderbtn.setText(bundle.getString("openFolder")); - sizelbl.setText(bundle.getString("fontSize")); updateBtn.setText(bundle.getString("checkUpdates")); + directoryBtn.setText(bundle.getString("chooseFolder")); + sizelbl.setText(bundle.getString("fontSize")); aulbl.setText(bundle.getString("autoUpdate")); versionlbl.setText(bundle.getString("version")+" "+version); columnName.setText(bundle.getString("columnName")); columnRating.setText(bundle.getString("columnRating")); columnDatName.setText(bundle.getString("columnDatName")); - errorUpdate = bundle.getString("errorUpdate"); + errorUpdateD = bundle.getString("errorUpdateD"); + errorUpdateV = bundle.getString("errorUpdateV"); infoText = bundle.getString("version")+" "+version+bundle.getString("infoText"); } diff --git a/src/menu_icon_white.png b/src/menu_icon_white.png new file mode 100644 index 0000000000000000000000000000000000000000..11adfa7989ee327eb0a6b1cbcedff0729ef2a030 GIT binary patch literal 15139 zcmeI3U2NM_6vsWJO;E9E<7EXO|5<(zeKp;Q}Cd34c@xaH%9w^uObZ?TY0zkB@N+9a_cZ*v!5$iODQeX_ z{(ISp&8yZ?RQy{bJL-*Q?vgdD7*cgB2SSyi4QEr7vaMpP+9dGk92hsu1oQJNZ!ol> zCzySa44<(Fz=Sb0>ww*}yRzEsq!!niZOI;`BEtYh;Hh+_STJ3=l3=QFWq9lla|~Ub z;!P%)em@~Sni-}CECMYAt4eMW8p2d$O}=94|77C6(kw{hk3gGVv;@Z zNOAPMJd)Z`PY108GvRr*%yH#%IaHQHmNO3J@i@neoG7wz2J6n4o?2l|cS9{mBTfpq znq%0WVVSfaSIt=^FTpT=qUNi9T}8W@$aL%MAVsdC+ME#LxlSToYijJ0Q>dPru5q9M zioo<-s1rKs>6^&e(t(0j^bY zG%z>~FJ(igtM`n2YjGAu@;zP89aM}iGT&2^RZF3^LJGWAdB6dxXE|BRDkN)FHrzl+ z4-EKK6$wS?P5TT}x5{p>!l9zpinro{lu|ha2MC3>e7IrX3U?v&^c95=m>XM=a=LX{Fnw+}v##U;t6(|sv_Mi)xK6_XRkhaSwCQ@PseyDV2?s)kq04$siu!*nFG+b;&xK=b zOq3$50FNY~hXLOgu0qUYg7UV|DN8H){ZbFD!_a-&26l?OZl2=@5-v??`KKPZwa6)+@jIeX*HE~nbE$0OQT$iACPy? zQJw%MuAyq7spRvpkk4r^j*-Cm2kScoQ2IR6)*VEhM5;i}XBZXuS|N&jpi zI_^sU=R&k9S({MJaiAx;MiDm#mbP}a6tm zQbggx!;rR3sKjf&jsr1Q(tU;w88cAb6AD!t+7A1Q!AXZxUR1K8Tm#LV(~+ zf(y?F@e*7J5WGon;rSq5f(rqHHwi90AH+*=AwcjZ!G-68cnK~92;L;P@O%(2!G!?9 zn*cK-4^~VDI z{+^;rJVpJmpQ7ZG6t&hmcK^FO;M_CmRDZVe`Nb12^}NlmKD@AE-D>ZrbvC>&8%K?%3XWs7VU$XZ}yyy9i^s^Y*m(hc3`IP;%m?TUi$FL ztFedatFLcM_udv)=B`|Lf7PY4b4QQgdebM*&6@`fpB_E+==?pC4?NO$_KxR!#W$zU n&%ZbM*r&{elW!gPZ9R2xs`SOqz4P!IC@MX;D>b)$|3iNPkiT}) literal 0 HcmV?d00001