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 7f2237a..56bcab9 100644 Binary files a/bin/application/MainWindowController$1.class and b/bin/application/MainWindowController$1.class differ diff --git a/bin/application/MainWindowController$2$1.class b/bin/application/MainWindowController$2$1.class index f20a801..0446fd1 100644 Binary files a/bin/application/MainWindowController$2$1.class and b/bin/application/MainWindowController$2$1.class differ diff --git a/bin/application/MainWindowController$2$2.class b/bin/application/MainWindowController$2$2.class index 20a7145..72ebfcf 100644 Binary files a/bin/application/MainWindowController$2$2.class and b/bin/application/MainWindowController$2$2.class differ diff --git a/bin/application/MainWindowController$2$3.class b/bin/application/MainWindowController$2$3.class index 7c34a8b..c5035cf 100644 Binary files a/bin/application/MainWindowController$2$3.class and b/bin/application/MainWindowController$2$3.class differ diff --git a/bin/application/MainWindowController$2$4.class b/bin/application/MainWindowController$2$4.class index b91a643..8ddb7a5 100644 Binary files a/bin/application/MainWindowController$2$4.class and b/bin/application/MainWindowController$2$4.class differ diff --git a/bin/application/MainWindowController$2$5.class b/bin/application/MainWindowController$2$5.class index e670191..58c4944 100644 Binary files a/bin/application/MainWindowController$2$5.class and b/bin/application/MainWindowController$2$5.class differ diff --git a/bin/application/MainWindowController$2$6.class b/bin/application/MainWindowController$2$6.class index 8f4224d..5c31ace 100644 Binary files a/bin/application/MainWindowController$2$6.class and b/bin/application/MainWindowController$2$6.class differ diff --git a/bin/application/MainWindowController$2.class b/bin/application/MainWindowController$2.class index 9769d9c..b4cbb9e 100644 Binary files a/bin/application/MainWindowController$2.class and b/bin/application/MainWindowController$2.class differ diff --git a/bin/application/MainWindowController$3.class b/bin/application/MainWindowController$3.class index b3eb020..31aa30d 100644 Binary files a/bin/application/MainWindowController$3.class and b/bin/application/MainWindowController$3.class differ diff --git a/bin/application/MainWindowController$4.class b/bin/application/MainWindowController$4.class index 91832b3..2866a08 100644 Binary files a/bin/application/MainWindowController$4.class and b/bin/application/MainWindowController$4.class differ diff --git a/bin/application/MainWindowController$5.class b/bin/application/MainWindowController$5.class index 1380ab2..1b07de0 100644 Binary files a/bin/application/MainWindowController$5.class and b/bin/application/MainWindowController$5.class differ diff --git a/bin/application/MainWindowController$6.class b/bin/application/MainWindowController$6.class index 57aa192..67e61fa 100644 Binary files a/bin/application/MainWindowController$6.class and b/bin/application/MainWindowController$6.class differ diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class index 1cab0b0..2a0ba97 100644 Binary files a/bin/application/MainWindowController.class and b/bin/application/MainWindowController.class differ diff --git a/bin/menu_icon_white.png b/bin/menu_icon_white.png new file mode 100644 index 0000000..11adfa7 Binary files /dev/null and b/bin/menu_icon_white.png differ 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 0000000..11adfa7 Binary files /dev/null and b/src/menu_icon_white.png differ