updated to 0.3.9

better style and overview

.classpath

@@ -3,8 +3,8 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER"/>
-	<classpathentry kind="lib" path="C:/Users/Jannik/workspace/Project HomeFlix/jfoenix.jar"/>
+	<classpathentry kind="lib" path="C:/Users/Jannik/workspace/Project HomeFlix/src/libraries/jfoenix.jar"/>
-	<classpathentry kind="lib" path="C:/Users/Jannik/workspace/Project HomeFlix/minimal-json-0.9.4.jar"/>
+	<classpathentry kind="lib" path="C:/Users/Jannik/workspace/Project HomeFlix/src/libraries/minimal-json-0.9.4.jar"/>
-	<classpathentry kind="lib" path="C:/Users/Jannik/workspace/Project HomeFlix/commons-lang3-3.4.jar"/>
+	<classpathentry kind="lib" path="C:/Users/Jannik/workspace/Project HomeFlix/src/libraries/commons-lang3-3.5.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.gitignore

@@ -45,9 +45,5 @@ $RECYCLE.BIN/
 Network Trash Folder
 Temporary Items
 .apdisk
-jfoenix.jar
-minimal-json-0.9.4.jar
 config.xml
 
-config.xml
-commons-lang3-3.4.jar

README.md

@@ -4,8 +4,9 @@ Project HomeFlix is a Kellerkinder Project. HomeFlix is a Programm that alowes y
 saved movies in clean UI.
 
 Librarys used in this Project:  
-JFoenix  https://github.com/jfoenixadmin/JFoenix   
+JFoenix: https://github.com/jfoenixadmin/JFoenix   
-minimal-json  https://github.com/ralfstx/minimal-json
+minimal-json: https://github.com/ralfstx/minimal-json   
+Commons Lang: https://commons.apache.org/proper/commons-lang/
 
 ## Installation
 

bin/application/HomeFlix-Local_de_DE.properties

@@ -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

bin/application/HomeFlix-Local_en_US.properties

@@ -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

bin/application/MainWindow.fxml

@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import com.jfoenix.controls.JFXButton?>
+<?import com.jfoenix.controls.JFXColorPicker?>
+<?import com.jfoenix.controls.JFXSlider?>
 <?import com.jfoenix.controls.JFXTextArea?>
 <?import com.jfoenix.controls.JFXTextField?>
+<?import com.jfoenix.controls.JFXToggleButton?>
+<?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TableView?>
 <?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.text.Font?>
 
 <AnchorPane fx:id="anpane" prefHeight="600.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.MainWindowController">
 	<children>
-		<VBox fx:id="topVBox" prefHeight="32.0" prefWidth="800.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-			<children>
-				<JFXButton fx:id="menubtn" onAction="#menubtnclicked" prefHeight="32.0" prefWidth="67.0" text="Menu" />
-			</children>
-		</VBox>
 		<TreeTableView fx:id="treeTableViewfilm" layoutX="14.0" layoutY="88.0" prefHeight="400.0" prefWidth="360.0" AnchorPane.bottomAnchor="12.0" AnchorPane.leftAnchor="12.0" AnchorPane.topAnchor="88.0" />
 		<JFXTextArea fx:id="ta1" layoutX="385.0" layoutY="42.0" maxWidth="503.0" minWidth="275.0" prefHeight="546.0" prefWidth="293.0" AnchorPane.bottomAnchor="12.0" AnchorPane.leftAnchor="385.0" AnchorPane.rightAnchor="222.0" AnchorPane.topAnchor="44.0" />
 		<JFXButton fx:id="playbtn" layoutX="690.0" layoutY="363.0" onAction="#playbtnclicked" prefHeight="25.0" prefWidth="198.0" text="play" AnchorPane.bottomAnchor="212.0" AnchorPane.rightAnchor="12.0">
@@ -30,8 +33,65 @@
          <font>
             <Font name="Arial" size="12.0" />
          </font></JFXTextField>
-      <ImageView fx:id="image1" fitHeight="297.0" fitWidth="198.0" layoutX="481.0" layoutY="46.0" pickOnBounds="true" preserveRatio="true" AnchorPane.rightAnchor="12.0" AnchorPane.topAnchor="44.0" />
+      <ImageView fx:id="image1" fitHeight="297.0" fitWidth="198.0" layoutX="481.0" layoutY="46.0" pickOnBounds="true" preserveRatio="true" AnchorPane.rightAnchor="12.0" AnchorPane.topAnchor="44.0">
+         <image>
+            <Image url="@../recources/Homeflix_Poster.png" />
+         </image></ImageView>
       <JFXButton fx:id="returnBtn" layoutX="690.0" layoutY="443.0" onAction="#returnBtnclicked" prefHeight="25.0" prefWidth="90.0" text="&lt;&lt;" AnchorPane.bottomAnchor="132.0" AnchorPane.rightAnchor="120.0" />
       <JFXButton fx:id="forwardBtn" layoutX="798.0" layoutY="443.0" onAction="#forwardBtnclicked" prefHeight="25.0" prefWidth="90.0" text="&gt;&gt;" AnchorPane.bottomAnchor="132.0" AnchorPane.rightAnchor="12.0" />
+      <HBox fx:id="topHBox" layoutY="12.0" prefHeight="32.0" prefWidth="900.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         <children>
+				<JFXButton fx:id="menubtn" onAction="#menubtnclicked" prefHeight="32.0" prefWidth="32.0" />
+         </children>
+      </HBox>
+      <VBox fx:id="sideMenuVBox" layoutY="32.0" prefHeight="660.0" prefWidth="150.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="38.0">
+         <children>
+            <JFXButton fx:id="infoBtn" onAction="#infoBtnclicked" prefHeight="32.0" prefWidth="150.0" textAlignment="CENTER">
+               <font>
+                  <Font name="System Bold" size="15.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="settingsBtn" onAction="#settingsBtnclicked" prefHeight="37.0" prefWidth="150.0" textAlignment="CENTER">
+               <font>
+                  <Font name="System Bold" size="15.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="streamingSettingsBtn" onAction="#streamingSettingsBtnclicked" prefHeight="32.0" prefWidth="150.0" textAlignment="CENTER">
+               <font>
+                  <Font name="System Bold" size="15.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="switchBtn" onAction="#switchBtnclicked" prefHeight="32.0" prefWidth="150.0" textAlignment="CENTER">
+               <font>
+                  <Font name="System Bold" size="15.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="debugBtn" onAction="#debugBtnclicked" prefHeight="32.0" prefWidth="150.0" text="debugging" textAlignment="CENTER">
+               <font>
+                  <Font name="System Bold" size="15.0" />
+               </font>
+            </JFXButton>
+         </children>
+      </VBox>
+      <AnchorPane fx:id="streamingSettingsAnchor" layoutX="138.0" layoutY="33.0" prefHeight="566.0" prefWidth="760.0" style="-fx-background-color: #FFFFFF;" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="38.0">
+         <children>
+            <JFXTextField fx:id="tfStreamingPath" layoutX="14.0" layoutY="14.0" onAction="#tfStreamingPathAction" prefWidth="250.0" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="5.0" />
+            <JFXButton fx:id="streamingDirectoryBtn" layoutX="263.0" layoutY="2.0" onAction="#streamingDirectoryBtnAction" AnchorPane.leftAnchor="260.0" AnchorPane.topAnchor="5.0" />
+            <TableView fx:id="tableViewStreamingdata" layoutX="14.0" layoutY="44.0" prefHeight="200.0" prefWidth="300.0" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="40.0" />
+         </children></AnchorPane>
+      <AnchorPane fx:id="settingsAnchor" layoutX="160.0" layoutY="44.0" prefHeight="566.0" prefWidth="760.0" style="-fx-background-color: #FFFFFF;" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="38.0">
+         <children>
+            <JFXTextField fx:id="tfPath" layoutX="14.0" layoutY="14.0" onAction="#tfPathAction" prefWidth="250.0" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="5.0" />
+            <JFXButton fx:id="directoryBtn" layoutX="255.0" layoutY="8.0" onAction="#directoryBtnAction" prefHeight="25.0" AnchorPane.leftAnchor="260.0" />
+            <JFXColorPicker fx:id="mainColor" layoutX="14.0" layoutY="45.0" onAction="#mainColorAction" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="40.0" />
+            <Label fx:id="sizelbl" layoutY="73.0" text="Label" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="75.0" />
+            <JFXSlider fx:id="sliderFontSize" layoutX="10.0" layoutY="99.0" max="48.0" min="2.0" prefWidth="250.0" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="110.0" />
+            <ChoiceBox fx:id="cbLocal" layoutX="14.0" layoutY="131.0" prefWidth="150.0" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="145.0" />
+            <JFXButton fx:id="updateBtn" layoutX="7.0" layoutY="177.0" onAction="#updateBtnAction" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="180.0" />
+            <Label fx:id="aulbl" layoutX="43.0" layoutY="219.0" text="Label" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="215.0" />
+            <JFXToggleButton fx:id="autoupdateBtn" layoutX="19.0" layoutY="215.0" onAction="#autoupdateBtnAction" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="230.0" />
+            <Label fx:id="versionlbl" layoutX="29.0" layoutY="297.0" text="Label" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="280.0" />
+         </children>
+      </AnchorPane>
 	</children>
 </AnchorPane>

bin/recources/HomeFlix-Local_de_DE.properties

@@ -1,19 +1,28 @@
 # HomeFlix-Local_de_DE.properties German Local
 info = Info
 settings = Einstellungen
+streamingSettings = Stream Einst.
 play = play
+tfPath = Pfad...
 openFolder = Ordner \u00F6ffnen
 chooseFolder = Ordner ausw\u00E4hlen
 fontSize = Schriftgr\u00F6\u00DFe:
 checkUpdates = Auf Update pr\u00FCfen
+updateBtnavail = Update verf\u00FCgbar
+updateBtnNotavail = Kein Update verf\u00FCgbar
 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

bin/recources/HomeFlix-Local_en_US.properties

@@ -1,19 +1,28 @@
 #  HomeFlix-Local_en_US.properties US-English Local and default
 info = Info
 settings = Settings
+streamingSettings = Stream Settings
 play = play
+tfPath = Path...
 openFolder = open Folder
 chooseFolder = choose Directory
 fontSize = font size:
 checkUpdates = check for updates
+updateBtnavail = update available
+updateBtnNotavail = no update available
 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

src/application/HomeFlix-Local_de_DE.properties

@@ -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

src/application/HomeFlix-Local_en_US.properties

@@ -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

src/application/Main.java

@@ -44,10 +44,14 @@ public class Main extends Application {
 	
 	public Stage primaryStage;
 	private String path;
+	private String streamingPath = System.getProperty("user.home") + "\\Documents\\HomeFlix";
 	private String color = "ee3523";
 	private String autoUpdate = "0";
+	private String mode = "local";	//local or streaming
 	private double size = 12;
 	private int local = 0;
+	private File dir = new File(System.getProperty("user.home") + "/Documents/HomeFlix");	//Windows: C:/Users/"User"/Documents/HomeFlix	OSX: has to be tested	Linux: has to be tested(shalt not work!)
+	private File file = new File(dir + "/config.xml");	//Windows: C:/Users/"User"/Documents/HomeFlix/config.xml	OSX: has to be tested	Linux: has to be tested(shalt not work!)
 	Properties props = new Properties();
 	private MainWindowController mainWindowController;
 	
@@ -58,7 +62,7 @@ public class Main extends Application {
 	}
 	
 	public void mainWindow(){
-		File file = new File("config.xml");
+	
 		try {
 		FXMLLoader loader = new FXMLLoader(Main.class.getResource("MainWindow.fxml"));
 		AnchorPane pane = loader.load();
@@ -68,29 +72,45 @@ public class Main extends Application {
 		primaryStage.setTitle("Project HomeFlix");
 		primaryStage.getIcons().add(new Image(Main.class.getResourceAsStream("/recources/Homeflix_Icon_64x64.png"))); //f<>gt Anwendungsicon hinzu
 
-		
 		mainWindowController = loader.getController();	//verkn<6B>pfung von FXMLController und Controller Klasse
 		mainWindowController.setAutoUpdate(autoUpdate);	//setzt autoupdate
 		mainWindowController.setMain(this);	//aufruf setMain
 		
-		//pr<EFBFBD>ft ob config.xml vorhanden, wenn nicht hole Pfad und schreibe Daten in Controller
+		//dir exists -> check config.xml 	TODO nur Windows getestet siehe dir und file
+		if(dir.exists() == true){
 			if (file.exists() != true) {
 				mainWindowController.setPath(firstStart());
+				mainWindowController.setStreamingPath(streamingPath);
 				mainWindowController.setColor(color);
 				mainWindowController.setSize(size);
 				mainWindowController.setAutoUpdate(autoUpdate);
 				mainWindowController.setLoaclUI(local);
+				mainWindowController.setMode(mode);
 				mainWindowController.saveSettings();
 				Runtime.getRuntime().exec("java -jar ProjectHomeFlix.jar");	//starte neu um Bugs zu verhindern
 				System.exit(0);	//beendet sich selbst
 			}else{
 				loadSettings();
 			}	
-
+		}else{
+		dir.mkdir();
+		mainWindowController.setPath(firstStart());
+		mainWindowController.setStreamingPath(streamingPath);
+		mainWindowController.setColor(color);
+		mainWindowController.setSize(size);
+		mainWindowController.setAutoUpdate(autoUpdate);
+		mainWindowController.setLoaclUI(local);
+		mainWindowController.setMode(mode);
+		mainWindowController.saveSettings();
+		Runtime.getRuntime().exec("java -jar ProjectHomeFlix.jar");	//starte neu um Bugs zu verhindern
+		System.exit(0);	//beendet sich selbst
+		}
+		mainWindowController.loadStreamingSettings();
 		mainWindowController.applyColor();	//setzt die Theme Farbe
 		mainWindowController.cbLocal.getSelectionModel().select(mainWindowController.getLocal()); //setzt local
 		mainWindowController.mainColor.setValue(Color.valueOf(mainWindowController.getColor()));
 		mainWindowController.loadData();	//l<>d die Daten im Controller
+		mainWindowController.addDataUI();
 		
 		Scene scene = new Scene(pane);	//neue Scen um inhalt der stage anzuzeigen
 		
@@ -124,24 +144,23 @@ public class Main extends Application {
 	
 	//l<>dt die einstellungen aus der XML
 	public void loadSettings(){
-		File configFile = new File("config.xml");
 		try {
-			InputStream inputStream = new FileInputStream(configFile);
+			InputStream inputStream = new FileInputStream(file);
 			props.loadFromXML(inputStream);
-			path = props.getProperty("path");
+			path = props.getProperty("path");	//setzt Propselement in Pfad
+			streamingPath = props.getProperty("streamingPath");
 			color = props.getProperty("color");
-			autoUpdate = props.getProperty("autoUpdate");
 			size = Double.parseDouble(props.getProperty("size"));
+			autoUpdate = props.getProperty("autoUpdate");
 			local = Integer.parseInt(props.getProperty("local"));
-			
+			mode = props.getProperty("mode");
 			inputStream.close();
 		} catch (IOException e) {
-			// Auto-generated catch block
+			System.out.println("An error has occurred!");
 			e.printStackTrace();
 		}
 	}
 	
-	
 	public static void main(String[] args) {
 		launch(args);
 	}

src/application/MainWindow.fxml

@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import com.jfoenix.controls.JFXButton?>
+<?import com.jfoenix.controls.JFXColorPicker?>
+<?import com.jfoenix.controls.JFXSlider?>
 <?import com.jfoenix.controls.JFXTextArea?>
 <?import com.jfoenix.controls.JFXTextField?>
+<?import com.jfoenix.controls.JFXToggleButton?>
+<?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TableView?>
 <?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.text.Font?>
 
 <AnchorPane fx:id="anpane" prefHeight="600.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.MainWindowController">
 	<children>
-		<VBox fx:id="topVBox" prefHeight="32.0" prefWidth="800.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-			<children>
-				<JFXButton fx:id="menubtn" onAction="#menubtnclicked" prefHeight="32.0" prefWidth="67.0" text="Menu" />
-			</children>
-		</VBox>
 		<TreeTableView fx:id="treeTableViewfilm" layoutX="14.0" layoutY="88.0" prefHeight="400.0" prefWidth="360.0" AnchorPane.bottomAnchor="12.0" AnchorPane.leftAnchor="12.0" AnchorPane.topAnchor="88.0" />
 		<JFXTextArea fx:id="ta1" layoutX="385.0" layoutY="42.0" maxWidth="503.0" minWidth="275.0" prefHeight="546.0" prefWidth="293.0" AnchorPane.bottomAnchor="12.0" AnchorPane.leftAnchor="385.0" AnchorPane.rightAnchor="222.0" AnchorPane.topAnchor="44.0" />
 		<JFXButton fx:id="playbtn" layoutX="690.0" layoutY="363.0" onAction="#playbtnclicked" prefHeight="25.0" prefWidth="198.0" text="play" AnchorPane.bottomAnchor="212.0" AnchorPane.rightAnchor="12.0">
@@ -30,8 +33,65 @@
          <font>
             <Font name="Arial" size="12.0" />
          </font></JFXTextField>
-      <ImageView fx:id="image1" fitHeight="297.0" fitWidth="198.0" layoutX="481.0" layoutY="46.0" pickOnBounds="true" preserveRatio="true" AnchorPane.rightAnchor="12.0" AnchorPane.topAnchor="44.0" />
+      <ImageView fx:id="image1" fitHeight="297.0" fitWidth="198.0" layoutX="481.0" layoutY="46.0" pickOnBounds="true" preserveRatio="true" AnchorPane.rightAnchor="12.0" AnchorPane.topAnchor="44.0">
+         <image>
+            <Image url="@../recources/Homeflix_Poster.png" />
+         </image></ImageView>
       <JFXButton fx:id="returnBtn" layoutX="690.0" layoutY="443.0" onAction="#returnBtnclicked" prefHeight="25.0" prefWidth="90.0" text="&lt;&lt;" AnchorPane.bottomAnchor="132.0" AnchorPane.rightAnchor="120.0" />
       <JFXButton fx:id="forwardBtn" layoutX="798.0" layoutY="443.0" onAction="#forwardBtnclicked" prefHeight="25.0" prefWidth="90.0" text="&gt;&gt;" AnchorPane.bottomAnchor="132.0" AnchorPane.rightAnchor="12.0" />
+      <HBox fx:id="topHBox" layoutY="12.0" prefHeight="32.0" prefWidth="900.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         <children>
+				<JFXButton fx:id="menubtn" onAction="#menubtnclicked" prefHeight="32.0" prefWidth="32.0" />
+         </children>
+      </HBox>
+      <VBox fx:id="sideMenuVBox" layoutY="32.0" prefHeight="660.0" prefWidth="150.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="38.0">
+         <children>
+            <JFXButton fx:id="infoBtn" onAction="#infoBtnclicked" prefHeight="32.0" prefWidth="150.0" textAlignment="CENTER">
+               <font>
+                  <Font name="System Bold" size="15.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="settingsBtn" onAction="#settingsBtnclicked" prefHeight="37.0" prefWidth="150.0" textAlignment="CENTER">
+               <font>
+                  <Font name="System Bold" size="15.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="streamingSettingsBtn" onAction="#streamingSettingsBtnclicked" prefHeight="32.0" prefWidth="150.0" textAlignment="CENTER">
+               <font>
+                  <Font name="System Bold" size="15.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="switchBtn" onAction="#switchBtnclicked" prefHeight="32.0" prefWidth="150.0" textAlignment="CENTER">
+               <font>
+                  <Font name="System Bold" size="15.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="debugBtn" onAction="#debugBtnclicked" prefHeight="32.0" prefWidth="150.0" text="debugging" textAlignment="CENTER">
+               <font>
+                  <Font name="System Bold" size="15.0" />
+               </font>
+            </JFXButton>
+         </children>
+      </VBox>
+      <AnchorPane fx:id="streamingSettingsAnchor" layoutX="138.0" layoutY="33.0" prefHeight="566.0" prefWidth="760.0" style="-fx-background-color: #FFFFFF;" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="38.0">
+         <children>
+            <JFXTextField fx:id="tfStreamingPath" layoutX="14.0" layoutY="14.0" onAction="#tfStreamingPathAction" prefWidth="250.0" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="5.0" />
+            <JFXButton fx:id="streamingDirectoryBtn" layoutX="263.0" layoutY="2.0" onAction="#streamingDirectoryBtnAction" AnchorPane.leftAnchor="260.0" AnchorPane.topAnchor="5.0" />
+            <TableView fx:id="tableViewStreamingdata" layoutX="14.0" layoutY="44.0" prefHeight="200.0" prefWidth="300.0" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="40.0" />
+         </children></AnchorPane>
+      <AnchorPane fx:id="settingsAnchor" layoutX="160.0" layoutY="44.0" prefHeight="566.0" prefWidth="760.0" style="-fx-background-color: #FFFFFF;" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="38.0">
+         <children>
+            <JFXTextField fx:id="tfPath" layoutX="14.0" layoutY="14.0" onAction="#tfPathAction" prefWidth="250.0" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="5.0" />
+            <JFXButton fx:id="directoryBtn" layoutX="255.0" layoutY="8.0" onAction="#directoryBtnAction" prefHeight="25.0" AnchorPane.leftAnchor="260.0" />
+            <JFXColorPicker fx:id="mainColor" layoutX="14.0" layoutY="45.0" onAction="#mainColorAction" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="40.0" />
+            <Label fx:id="sizelbl" layoutY="73.0" text="Label" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="75.0" />
+            <JFXSlider fx:id="sliderFontSize" layoutX="10.0" layoutY="99.0" max="48.0" min="2.0" prefWidth="250.0" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="110.0" />
+            <ChoiceBox fx:id="cbLocal" layoutX="14.0" layoutY="131.0" prefWidth="150.0" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="145.0" />
+            <JFXButton fx:id="updateBtn" layoutX="7.0" layoutY="177.0" onAction="#updateBtnAction" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="180.0" />
+            <Label fx:id="aulbl" layoutX="43.0" layoutY="219.0" text="Label" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="215.0" />
+            <JFXToggleButton fx:id="autoupdateBtn" layoutX="19.0" layoutY="215.0" onAction="#autoupdateBtnAction" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="230.0" />
+            <Label fx:id="versionlbl" layoutX="29.0" layoutY="297.0" text="Label" AnchorPane.leftAnchor="5.0" AnchorPane.topAnchor="280.0" />
+         </children>
+      </AnchorPane>
 	</children>
 </AnchorPane>

src/application/streamUiData.java

@@ -0,0 +1,115 @@
+package application;
+
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.SimpleDoubleProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+public class streamUiData {
+	
+	private IntegerProperty year = new SimpleIntegerProperty();
+	private IntegerProperty season = new SimpleIntegerProperty();
+	private IntegerProperty episode = new SimpleIntegerProperty();
+	private DoubleProperty rating = new SimpleDoubleProperty();
+	private StringProperty resolution = new SimpleStringProperty();
+	private StringProperty titel = new SimpleStringProperty();
+	private StringProperty streamUrl = new SimpleStringProperty();
+	
+	//uiData ist der Typ der Daten in der TreeTabelView
+	public streamUiData (final int year, final int season, final int episode, final double rating, final String resolution, final String titel, final String streamUrl) {
+		this.year.set(year);
+		this.season.set(season);
+		this.episode.set(episode);
+		this.rating.set(rating);
+		this.resolution.set(resolution);
+		this.titel.set(titel);
+		this.streamUrl.set(streamUrl);
+	}
+
+	public int getYear() {
+		return year.get();
+	}
+
+	public int getSeason() {
+		return season.get();
+	}
+	
+	public int getEpisode() {
+		return episode.get();
+	}
+	
+	public double getRating() {
+		return rating.get();
+	}
+
+	public String getResolution() {
+		return resolution.get();
+	}
+	
+	public String getTitel() {
+		return titel.get();
+	}
+	
+	public String getStreamUrl() {
+		return streamUrl.get();
+	}
+
+
+	public void setYear(int year) {
+		this.year.set(year);
+	}
+
+	public void setSeason(int season) {
+		this.season.set(season);
+	}
+	
+	public void setEpisode(int season) {
+		this.episode.set(season);
+	}
+	
+	public void setRating(int rating) {
+		this.rating.set(rating);
+	}
+	
+	public void setResolution(String resolution) {
+		this.resolution.set(resolution);
+	}
+	
+	public void setTitel(String titel) {
+		this.titel.set(titel);
+	}
+
+	public void setStreamUrl(StringProperty streamUrl) {
+		this.streamUrl = streamUrl;
+	}
+
+	public IntegerProperty yearProperty(){
+		return year;
+	}
+	
+	public IntegerProperty seasonProperty(){
+		return season;
+	}
+	
+	public IntegerProperty episodeProperty(){
+		return episode;
+	}
+	
+	public DoubleProperty ratingProperty(){
+		return rating;
+	}
+	
+	public StringProperty resolutionProperty(){
+		return resolution;
+	}
+	
+	public StringProperty titelProperty(){
+		return titel;
+	}
+	
+	public StringProperty streamUrlProperty(){
+		return streamUrl;
+	}
+}

src/recources/HomeFlix-Local_de_DE.properties

@@ -1,19 +1,28 @@
 # HomeFlix-Local_de_DE.properties German Local
 info = Info
 settings = Einstellungen
+streamingSettings = Stream Einst.
 play = play
+tfPath = Pfad...
 openFolder = Ordner \u00F6ffnen
 chooseFolder = Ordner ausw\u00E4hlen
 fontSize = Schriftgr\u00F6\u00DFe:
 checkUpdates = Auf Update pr\u00FCfen
+updateBtnavail = Update verf\u00FCgbar
+updateBtnNotavail = Kein Update verf\u00FCgbar
 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

src/recources/HomeFlix-Local_en_US.properties

@@ -1,19 +1,28 @@
 #  HomeFlix-Local_en_US.properties US-English Local and default
 info = Info
 settings = Settings
+streamingSettings = Stream Settings
 play = play
+tfPath = Path...
 openFolder = open Folder
 chooseFolder = choose Directory
 fontSize = font size:
 checkUpdates = check for updates
+updateBtnavail = update available
+updateBtnNotavail = no update available
 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

updates/version.txt

@@ -1 +1 @@
-0.3.6
+0.3.9