update to version 0.3.5
This commit is contained in:
parent
18f387b4b1
commit
4145a09b5d
|
@ -47,3 +47,5 @@ Temporary Items
|
||||||
.apdisk
|
.apdisk
|
||||||
jfoenix.jar
|
jfoenix.jar
|
||||||
minimal-json-0.9.4.jar
|
minimal-json-0.9.4.jar
|
||||||
|
config.xml
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
# HomeFlix-Local_de_DE.properties German Local
|
# HomeFlix-Local_de_DE.properties German Local
|
||||||
info = Info
|
info = Info
|
||||||
settings = Einstellungen
|
settings = Einstellungen
|
||||||
play = play
|
play = play
|
||||||
openFolder = Ordner \u00F6ffnen
|
openFolder = Ordner \u00F6ffnen
|
||||||
chooseFolder = Ordner auswählen
|
chooseFolder = Ordner ausw\u00E4hlen
|
||||||
fontSize = Schriftgr\u00F6\u00DFe:
|
fontSize = Schriftgr\u00F6\u00DFe:
|
||||||
checkUpdates = Auf Update pr\u00FCfen
|
checkUpdates = Auf Update pr\u00FCfen
|
||||||
autoUpdate = beim Start nach Updates suchen:
|
autoUpdate = beim Start nach Updates suchen:
|
||||||
|
@ -11,5 +11,6 @@ version = Version:
|
||||||
columnName = Name
|
columnName = Name
|
||||||
columnRating = Bewertung
|
columnRating = Bewertung
|
||||||
columnDatName = Datei Name
|
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
|
infoText = \nMaintainer: seilo@kellerkinder.xyz und \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz
|
|
@ -11,5 +11,6 @@ version = Version:
|
||||||
columnName = Name
|
columnName = Name
|
||||||
columnRating = Rating
|
columnRating = Rating
|
||||||
columnDatName = File Name
|
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
|
infoText = \nMaintainer: seilo@kellerkinder.xyz and \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
After Width: | Height: | Size: 15 KiB |
|
@ -2,9 +2,9 @@
|
||||||
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
|
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
|
||||||
<properties>
|
<properties>
|
||||||
<comment>Project HomeFlix settings</comment>
|
<comment>Project HomeFlix settings</comment>
|
||||||
<entry key="color">ee3523</entry>
|
|
||||||
<entry key="autoUpdate">0</entry>
|
<entry key="autoUpdate">0</entry>
|
||||||
<entry key="size">12.0</entry>
|
<entry key="color">ee3523</entry>
|
||||||
<entry key="local">1</entry>
|
<entry key="local">1</entry>
|
||||||
|
<entry key="size">12.0</entry>
|
||||||
<entry key="path">C:\Users\Jannik\Videos\Beispielfilme</entry>
|
<entry key="path">C:\Users\Jannik\Videos\Beispielfilme</entry>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
# HomeFlix-Local_de_DE.properties German Local
|
# HomeFlix-Local_de_DE.properties German Local
|
||||||
info = Info
|
info = Info
|
||||||
settings = Einstellungen
|
settings = Einstellungen
|
||||||
play = play
|
play = play
|
||||||
openFolder = Ordner \u00F6ffnen
|
openFolder = Ordner \u00F6ffnen
|
||||||
chooseFolder = Ordner auswählen
|
chooseFolder = Ordner ausw\u00E4hlen
|
||||||
fontSize = Schriftgr\u00F6\u00DFe:
|
fontSize = Schriftgr\u00F6\u00DFe:
|
||||||
checkUpdates = Auf Update pr\u00FCfen
|
checkUpdates = Auf Update pr\u00FCfen
|
||||||
autoUpdate = beim Start nach Updates suchen:
|
autoUpdate = beim Start nach Updates suchen:
|
||||||
|
@ -11,5 +11,6 @@ version = Version:
|
||||||
columnName = Name
|
columnName = Name
|
||||||
columnRating = Bewertung
|
columnRating = Bewertung
|
||||||
columnDatName = Datei Name
|
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
|
infoText = \nMaintainer: seilo@kellerkinder.xyz und \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz
|
|
@ -11,5 +11,6 @@ version = Version:
|
||||||
columnName = Name
|
columnName = Name
|
||||||
columnRating = Rating
|
columnRating = Rating
|
||||||
columnDatName = File Name
|
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
|
infoText = \nMaintainer: seilo@kellerkinder.xyz and \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz
|
|
@ -147,11 +147,12 @@ public class MainWindowController {
|
||||||
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 settingstrue = false;
|
||||||
private String version = "0.3.5";
|
private String version = "0.3.5";
|
||||||
private String versionURL = "https://raw.githubusercontent.com/Seil0/Project-HomeFlix/master/version";
|
private String versionURL = "https://raw.githubusercontent.com/Seil0/Project-HomeFlix/master/updates/version.txt";
|
||||||
private String downloadLink = "";
|
private String downloadLink = "https://raw.githubusercontent.com/Seil0/Project-HomeFlix/master/updates/downloadLink.txt";
|
||||||
private String updateDataURL = "https://raw.githubusercontent.com/Seil0/Project-HomeFlix/master/ProjectHomeFlix.jar";
|
|
||||||
|
|
||||||
private String errorUpdate;
|
private String updateDataURL;
|
||||||
|
private String errorUpdateD;
|
||||||
|
private String errorUpdateV;
|
||||||
private String infoText;
|
private String infoText;
|
||||||
private String aktVersion;
|
private String aktVersion;
|
||||||
private String path;
|
private String path;
|
||||||
|
@ -172,7 +173,7 @@ public class MainWindowController {
|
||||||
private ObservableList<String> locals = FXCollections.observableArrayList("english", "deutsch");
|
private ObservableList<String> locals = FXCollections.observableArrayList("english", "deutsch");
|
||||||
private Image imHF = new Image("Homeflix_Poster.png");
|
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_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();
|
private DirectoryChooser directoryChooser = new DirectoryChooser();
|
||||||
Properties props = new Properties();
|
Properties props = new Properties();
|
||||||
|
|
||||||
|
@ -522,7 +523,11 @@ public class MainWindowController {
|
||||||
aktVersion = in.readLine(); //schreibt inputstream in String
|
aktVersion = in.readLine(); //schreibt inputstream in String
|
||||||
in.close();
|
in.close();
|
||||||
} catch (IOException e1) {
|
} 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();
|
e1.printStackTrace();
|
||||||
}
|
}
|
||||||
System.out.println("Version: "+version+", Update: "+aktVersion);
|
System.out.println("Version: "+version+", Update: "+aktVersion);
|
||||||
|
@ -541,7 +546,7 @@ public class MainWindowController {
|
||||||
URL website;
|
URL website;
|
||||||
URL downloadURL = new URL(downloadLink);
|
URL downloadURL = new URL(downloadLink);
|
||||||
BufferedReader in = new BufferedReader(new InputStreamReader(downloadURL.openStream()));
|
BufferedReader in = new BufferedReader(new InputStreamReader(downloadURL.openStream()));
|
||||||
//updateDataURL = in.readLine();
|
updateDataURL = in.readLine();
|
||||||
website = new URL(updateDataURL); //Update URL
|
website = new URL(updateDataURL); //Update URL
|
||||||
ReadableByteChannel rbc = Channels.newChannel(website.openStream()); //öffnet neuen Stream/Channel
|
ReadableByteChannel rbc = Channels.newChannel(website.openStream()); //öffnet neuen Stream/Channel
|
||||||
FileOutputStream fos = new FileOutputStream("ProjectHomeFlix.jar"); //neuer fileoutputstram für ProjectHomeFLix.jar
|
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
|
Runtime.getRuntime().exec("java -jar ProjectHomeFlix.jar"); //starte neu
|
||||||
System.exit(0); //beendet sich selbst
|
System.exit(0); //beendet sich selbst
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
//Falls ein Fehler auftritt (ungetestet)
|
//Falls ein Fehler auftritt
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
Alert alert = new Alert(AlertType.ERROR);
|
Alert alert = new Alert(AlertType.ERROR);
|
||||||
alert.setTitle("Error");
|
alert.setTitle("Error");
|
||||||
alert.setHeaderText("");
|
alert.setHeaderText("");
|
||||||
alert.setContentText(errorUpdate);
|
alert.setContentText(errorUpdateD);
|
||||||
alert.showAndWait();
|
alert.showAndWait();
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
@ -610,8 +615,7 @@ public class MainWindowController {
|
||||||
openfolderbtn.setStyle(btnStylewhite);
|
openfolderbtn.setStyle(btnStylewhite);
|
||||||
returnBtn.setStyle(btnStylewhite);
|
returnBtn.setStyle(btnStylewhite);
|
||||||
forwardBtn.setStyle(btnStylewhite);
|
forwardBtn.setStyle(btnStylewhite);
|
||||||
//TODO menubtn.setGraphic(menu_icon_white);
|
menubtn.setGraphic(menu_icon_white);
|
||||||
menubtn.setGraphic(menu_icon_black);
|
|
||||||
}else{
|
}else{
|
||||||
settingsBtn.setStyle("-fx-text-fill: BLACK;");
|
settingsBtn.setStyle("-fx-text-fill: BLACK;");
|
||||||
infoBtn.setStyle("-fx-text-fill: BLACK;");
|
infoBtn.setStyle("-fx-text-fill: BLACK;");
|
||||||
|
@ -641,14 +645,16 @@ public class MainWindowController {
|
||||||
infoBtn.setText(bundle.getString("info"));
|
infoBtn.setText(bundle.getString("info"));
|
||||||
playbtn.setText(bundle.getString("play"));
|
playbtn.setText(bundle.getString("play"));
|
||||||
openfolderbtn.setText(bundle.getString("openFolder"));
|
openfolderbtn.setText(bundle.getString("openFolder"));
|
||||||
sizelbl.setText(bundle.getString("fontSize"));
|
|
||||||
updateBtn.setText(bundle.getString("checkUpdates"));
|
updateBtn.setText(bundle.getString("checkUpdates"));
|
||||||
|
directoryBtn.setText(bundle.getString("chooseFolder"));
|
||||||
|
sizelbl.setText(bundle.getString("fontSize"));
|
||||||
aulbl.setText(bundle.getString("autoUpdate"));
|
aulbl.setText(bundle.getString("autoUpdate"));
|
||||||
versionlbl.setText(bundle.getString("version")+" "+version);
|
versionlbl.setText(bundle.getString("version")+" "+version);
|
||||||
columnName.setText(bundle.getString("columnName"));
|
columnName.setText(bundle.getString("columnName"));
|
||||||
columnRating.setText(bundle.getString("columnRating"));
|
columnRating.setText(bundle.getString("columnRating"));
|
||||||
columnDatName.setText(bundle.getString("columnDatName"));
|
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");
|
infoText = bundle.getString("version")+" "+version+bundle.getString("infoText");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 15 KiB |
Loading…
Reference in New Issue