fixed typo error
							
								
								
									
										1
									
								
								bin/.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						| @ -1,2 +1,3 @@ | ||||
| /application/ | ||||
| /libraries/ | ||||
| /resources/ | ||||
|  | ||||
| @ -40,7 +40,7 @@ | ||||
|          </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"> | ||||
|          <image> | ||||
|             <Image url="@../recources/Homeflix_Poster.png" /> | ||||
|             <Image url="@../resources/Homeflix_Poster.png" /> | ||||
|          </image></ImageView> | ||||
|       <JFXButton fx:id="returnBtn" contentDisplay="CENTER" layoutX="690.0" layoutY="443.0" onAction="#returnBtnclicked" prefHeight="25.0" prefWidth="90.0" AnchorPane.bottomAnchor="132.0" AnchorPane.rightAnchor="120.0" /> | ||||
|       <JFXButton fx:id="forwardBtn" contentDisplay="CENTER" layoutX="798.0" layoutY="443.0" onAction="#forwardBtnclicked" prefHeight="25.0" prefWidth="90.0" AnchorPane.bottomAnchor="132.0" AnchorPane.rightAnchor="12.0" /> | ||||
|  | ||||
| @ -39,8 +39,8 @@ public class DBController { | ||||
| 	private MainWindowController mainWindowController; | ||||
| 	private Main main; | ||||
| 	private String DB_PATH = System.getProperty("user.home") + "\\Documents\\HomeFlix" + "\\" + "Homeflix.db"; //path to database file | ||||
| 	private Image favorite_black = new Image("recources/icons/ic_favorite_black_18dp_1x.png"); | ||||
| 	private Image favorite_border_black = new Image("recources/icons/ic_favorite_border_black_18dp_1x.png"); | ||||
| 	private Image favorite_black = new Image("resources/icons/ic_favorite_black_18dp_1x.png"); | ||||
| 	private Image favorite_border_black = new Image("resources/icons/ic_favorite_border_black_18dp_1x.png"); | ||||
| 	private List<String> filmsdbAll = new ArrayList<String>(); | ||||
| 	private List<String> filmsdbLocal = new ArrayList<String>(); | ||||
| 	private List<String> filmsdbStream = new ArrayList<String>(); | ||||
| @ -198,7 +198,7 @@ public class DBController { | ||||
| 						ps.close(); | ||||
| 						psS.close(); | ||||
| 					}catch (SQLException ea) {  | ||||
| 						System.err.println("Konnte nicht ausgef<65>hrt werden");  | ||||
| 						System.err.println("Konnte nicht ausgef<65>hrt werden");  | ||||
| 						ea.printStackTrace();  | ||||
| 					} | ||||
| 				}else { | ||||
| @ -365,7 +365,7 @@ public class DBController { | ||||
| 					String titel = items.get(i).asObject().getString("titel",""); | ||||
| 					 | ||||
| 					if(streamURL.equals(filmsStreamURL.get(b))){ | ||||
| 						System.out.println("hinzuf<EFBFBD>gen \""+titel+"\""); | ||||
| 						System.out.println("hinzuf<EFBFBD>gen \""+titel+"\""); | ||||
| 						 | ||||
| 						ps.setInt(1, items.get(i).asObject().getInt("year", 0)); | ||||
| 						ps.setInt(2, items.get(i).asObject().getInt("season", 0)); | ||||
| @ -598,7 +598,7 @@ public class DBController { | ||||
| 			try{ | ||||
| 				mainWindowController.image1.setImage(im); | ||||
| 			}catch (Exception e){ | ||||
| 				mainWindowController.image1.setImage(new Image("recources/icons/close_black_2048x2048.png")); | ||||
| 				mainWindowController.image1.setImage(new Image("resources/icons/close_black_2048x2048.png")); | ||||
| 				e.printStackTrace(); | ||||
| 			} | ||||
| 			mainWindowController.image1.setImage(im); | ||||
|  | ||||
| @ -73,7 +73,7 @@ public class Main extends Application { | ||||
| 		primaryStage.setMinWidth(900.00); | ||||
| 		primaryStage.setResizable(false); | ||||
| 		primaryStage.setTitle("Project HomeFlix"); | ||||
| 		primaryStage.getIcons().add(new Image(Main.class.getResourceAsStream("/recources/Homeflix_Icon_64x64.png"))); //adds application icon | ||||
| 		primaryStage.getIcons().add(new Image(Main.class.getResourceAsStream("/resources/Homeflix_Icon_64x64.png"))); //adds application icon | ||||
|  | ||||
| 		mainWindowController = loader.getController();	//Link of FXMLController and controller class | ||||
| 		mainWindowController.setAutoUpdate(AUTO_UPDATE);	//set auto-update | ||||
| @ -140,11 +140,11 @@ public class Main extends Application { | ||||
| 	private String firstStart(){ | ||||
| 		MainWindowController.firststart = true; | ||||
| 		switch(System.getProperty("user.language")+"_"+System.getProperty("user.country")){ | ||||
| 		case "en_US":	bundle = ResourceBundle.getBundle("recources.HomeFlix-Local", Locale.US);	//us_english | ||||
| 		case "en_US":	bundle = ResourceBundle.getBundle("resources.HomeFlix-Local", Locale.US);	//us_english | ||||
| 				break; | ||||
|      	case "de_DE":	bundle = ResourceBundle.getBundle("recources.HomeFlix-Local", Locale.GERMAN);	//German | ||||
|      	case "de_DE":	bundle = ResourceBundle.getBundle("resources.HomeFlix-Local", Locale.GERMAN);	//German | ||||
|      			break; | ||||
|      	default:		bundle = ResourceBundle.getBundle("recources.HomeFlix-Local", Locale.US);	//default local | ||||
|      	default:		bundle = ResourceBundle.getBundle("resources.HomeFlix-Local", Locale.US);	//default local | ||||
|      			break; | ||||
| 		 } | ||||
| 		 | ||||
|  | ||||
| @ -40,7 +40,7 @@ | ||||
|          </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"> | ||||
|          <image> | ||||
|             <Image url="@../recources/Homeflix_Poster.png" /> | ||||
|             <Image url="@../resources/Homeflix_Poster.png" /> | ||||
|          </image></ImageView> | ||||
|       <JFXButton fx:id="returnBtn" contentDisplay="CENTER" layoutX="690.0" layoutY="443.0" onAction="#returnBtnclicked" prefHeight="25.0" prefWidth="90.0" AnchorPane.bottomAnchor="132.0" AnchorPane.rightAnchor="120.0" /> | ||||
|       <JFXButton fx:id="forwardBtn" contentDisplay="CENTER" layoutX="798.0" layoutY="443.0" onAction="#forwardBtnclicked" prefHeight="25.0" prefWidth="90.0" AnchorPane.bottomAnchor="132.0" AnchorPane.rightAnchor="12.0" /> | ||||
|  | ||||
| @ -240,14 +240,14 @@ public class MainWindowController { | ||||
| 	ObservableList<tableData> localFilms = FXCollections.observableArrayList(); | ||||
| 	ObservableList<tableData> streamingFilms = FXCollections.observableArrayList(); | ||||
| 	ObservableList<tableData> streamingData = FXCollections.observableArrayList(); | ||||
| 	private ImageView menu_icon_black = new ImageView(new Image("recources/icons/menu_icon_black.png")); | ||||
| 	private ImageView menu_icon_white = new ImageView(new Image("recources/icons/menu_icon_white.png")); | ||||
| 	private ImageView skip_previous_white = new ImageView(new Image("recources/icons/ic_skip_previous_white_18dp_1x.png")); | ||||
| 	private ImageView skip_previous_black = new ImageView(new Image("recources/icons/ic_skip_previous_black_18dp_1x.png")); | ||||
| 	private ImageView skip_next_white = new ImageView(new Image("recources/icons/ic_skip_next_white_18dp_1x.png")); | ||||
| 	private ImageView skip_next_black = new ImageView(new Image("recources/icons/ic_skip_next_black_18dp_1x.png")); | ||||
| 	private ImageView play_arrow_white = new ImageView(new Image("recources/icons/ic_play_arrow_white_18dp_1x.png")); | ||||
| 	private ImageView play_arrow_black = new ImageView(new Image("recources/icons/ic_play_arrow_black_18dp_1x.png")); | ||||
| 	private ImageView menu_icon_black = new ImageView(new Image("resources/icons/menu_icon_black.png")); | ||||
| 	private ImageView menu_icon_white = new ImageView(new Image("resources/icons/menu_icon_white.png")); | ||||
| 	private ImageView skip_previous_white = new ImageView(new Image("resources/icons/ic_skip_previous_white_18dp_1x.png")); | ||||
| 	private ImageView skip_previous_black = new ImageView(new Image("resources/icons/ic_skip_previous_black_18dp_1x.png")); | ||||
| 	private ImageView skip_next_white = new ImageView(new Image("resources/icons/ic_skip_next_white_18dp_1x.png")); | ||||
| 	private ImageView skip_next_black = new ImageView(new Image("resources/icons/ic_skip_next_black_18dp_1x.png")); | ||||
| 	private ImageView play_arrow_white = new ImageView(new Image("resources/icons/ic_play_arrow_white_18dp_1x.png")); | ||||
| 	private ImageView play_arrow_black = new ImageView(new Image("resources/icons/ic_play_arrow_black_18dp_1x.png")); | ||||
| 	private DirectoryChooser directoryChooser = new DirectoryChooser(); | ||||
|     private MenuItem like = new MenuItem("like"); | ||||
|     private MenuItem dislike = new MenuItem("dislike");	//TODO one option (like or dislike) | ||||
| @ -920,15 +920,15 @@ public class MainWindowController { | ||||
| 	void setLocalUI(){ | ||||
| 		switch(getLocal()){ | ||||
| 		case "en_US":	 | ||||
| 			bundle = ResourceBundle.getBundle("recources.HomeFlix-Local", Locale.US);	//us_English | ||||
| 			bundle = ResourceBundle.getBundle("resources.HomeFlix-Local", Locale.US);	//us_English | ||||
| 			cbLocal.getSelectionModel().select(0); | ||||
| 			break; | ||||
|      	case "de_DE":	 | ||||
|      		bundle = ResourceBundle.getBundle("recources.HomeFlix-Local", Locale.GERMAN);	//German | ||||
|      		bundle = ResourceBundle.getBundle("resources.HomeFlix-Local", Locale.GERMAN);	//German | ||||
| 			cbLocal.getSelectionModel().select(1); | ||||
| 			break; | ||||
|      	default:		 | ||||
|      		bundle = ResourceBundle.getBundle("recources.HomeFlix-Local", Locale.US);	//default local | ||||
|      		bundle = ResourceBundle.getBundle("resources.HomeFlix-Local", Locale.US);	//default local | ||||
| 			cbLocal.getSelectionModel().select(0); | ||||
| 			break; | ||||
| 		 } | ||||
|  | ||||
| @ -135,7 +135,7 @@ public class apiQuery{ | ||||
| 				//if response == false then show mainWindowController.noFilmFound else create new Texts and add them to flowText | ||||
| 				if(responseString[19].equals("False")){ | ||||
| 					mainWindowController.textFlow.getChildren().add(new Text(mainWindowController.noFilmFound)); | ||||
| 					im = new Image("recources/icons/close_black_2048x2048.png"); | ||||
| 					im = new Image("resources/icons/close_black_2048x2048.png"); | ||||
| 					mainWindowController.image1.setImage(im); | ||||
| 				}else{ | ||||
| 					nameText.add(0, new Text(mainWindowController.title+": ")); | ||||
| @ -167,7 +167,7 @@ public class apiQuery{ | ||||
| 					 | ||||
| 					//if there is no poster | ||||
| 					if(responseString[18].equals("N/A")){ | ||||
| 						im = new Image("recources/icons/close_black_2048x2048.png"); | ||||
| 						im = new Image("resources/icons/close_black_2048x2048.png"); | ||||
| 					}else{ | ||||
| 						im = new Image(responseString[18]); | ||||
| 					} | ||||
|  | ||||
| @ -1,50 +0,0 @@ | ||||
| # HomeFlix-Local_de_DE.properties German Local | ||||
| info = Info | ||||
| settings = Einstellungen | ||||
| streamingSettings = Stream Einst. | ||||
| tfPath = Pfad... | ||||
| tfSearch = Suche... | ||||
| openFolder = Ordner \u00F6ffnen | ||||
| chooseFolder = Ordner ausw\u00E4hlen | ||||
| fontSize = Schriftgr\u00F6\u00DFe: | ||||
| checkUpdates = Auf Update pr\u00FCfen | ||||
| checkingUpdates = Es wird nach Updates gesucht... | ||||
| updateBtnavail = Update verf\u00FCgbar | ||||
| updateBtnNotavail = Kein Update verf\u00FCgbar | ||||
| autoUpdate = beim Start nach Updates suchen: | ||||
| version = Version: | ||||
| columnName = Name | ||||
| columnRating = Bewertung | ||||
| 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! | ||||
| errorLoad = Beim laden der Einstellungen ist ein Fehler aufgetreten! | ||||
| errorSave = Beim speichern der Einstellungen ist ein Fehler aufgetreten! | ||||
| noFilmFound = Kein Film mit diesem Titel gefunden! | ||||
| 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-2017 Kellerkinder www.kellerkinder.xyz | ||||
| title = Titel | ||||
| year = Jahr | ||||
| rating = Einstufung | ||||
| publishedOn = Ver\u00F6ffentlicht am | ||||
| duration = Laufzeit | ||||
| genre = Gener | ||||
| director = Regisseur | ||||
| writer = Autor | ||||
| actors = Schauspieler | ||||
| plot = Beschreibung | ||||
| language = Original Sprache | ||||
| country = Produktionsland | ||||
| awards = Auszeichnungen | ||||
| metascore = Metascore | ||||
| imdbRating = IMDB-Bewertung | ||||
| type = Type | ||||
| firstStartHeader = Es ist kein Stammverzeichnis f\u00FCr Filme angegeben! | ||||
| firstStartContent = Stammverzeichniss angeben? | ||||
| @ -1,50 +0,0 @@ | ||||
| #  HomeFlix-Local_en_US.properties US-English Local and default | ||||
| info = Info | ||||
| settings = Settings | ||||
| streamingSettings = Stream Settings | ||||
| tfPath = Path... | ||||
| tfSearch = Search... | ||||
| openFolder = open Folder | ||||
| chooseFolder = choose Directory | ||||
| fontSize = font size: | ||||
| checkUpdates = check for updates | ||||
| checkingUpdates = checking for updates... | ||||
| updateBtnavail = update available | ||||
| updateBtnNotavail = no update available | ||||
| autoUpdate = check at startup for updates: | ||||
| version = Version: | ||||
| columnName = Name | ||||
| columnRating = Rating | ||||
| 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! | ||||
| errorLoad = An error occurred while loading the settings! | ||||
| errorSave = An error occurred while saving the settings! | ||||
| noFilmFound = No film with this title found! | ||||
| 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-2017 Kellerkinder www.kellerkinder.xyz | ||||
| title = Title | ||||
| year = Year | ||||
| rating = Rating | ||||
| publishedOn = published on | ||||
| duration = Duration | ||||
| genre = Gener | ||||
| director = Director | ||||
| writer = Writer | ||||
| actors = Actors | ||||
| plot = Plot | ||||
| language = Language | ||||
| country = Country | ||||
| awards = Awards | ||||
| metascore = Metascore | ||||
| imdbRating = IMDB-Rating | ||||
| type = Type | ||||
| firstStartHeader = There is no root directory for movies! | ||||
| firstStartContent = Specify a root directory? | ||||
| Before Width: | Height: | Size: 24 KiB | 
| Before Width: | Height: | Size: 30 KiB | 
| Before Width: | Height: | Size: 9.3 KiB | 
| Before Width: | Height: | Size: 214 B | 
| Before Width: | Height: | Size: 261 B | 
| Before Width: | Height: | Size: 131 B | 
| Before Width: | Height: | Size: 135 B | 
| Before Width: | Height: | Size: 215 B | 
| Before Width: | Height: | Size: 128 B | 
| Before Width: | Height: | Size: 134 B | 
| Before Width: | Height: | Size: 131 B | 
| Before Width: | Height: | Size: 138 B | 
| Before Width: | Height: | Size: 14 KiB | 
| Before Width: | Height: | Size: 15 KiB | 
| Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB | 
| Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB | 
| Before Width: | Height: | Size: 9.3 KiB After Width: | Height: | Size: 9.3 KiB | 
| Before Width: | Height: | Size: 214 B After Width: | Height: | Size: 214 B | 
| Before Width: | Height: | Size: 261 B After Width: | Height: | Size: 261 B | 
| Before Width: | Height: | Size: 131 B After Width: | Height: | Size: 131 B | 
| Before Width: | Height: | Size: 135 B After Width: | Height: | Size: 135 B | 
| Before Width: | Height: | Size: 215 B After Width: | Height: | Size: 215 B | 
| Before Width: | Height: | Size: 128 B After Width: | Height: | Size: 128 B | 
| Before Width: | Height: | Size: 134 B After Width: | Height: | Size: 134 B | 
| Before Width: | Height: | Size: 131 B After Width: | Height: | Size: 131 B | 
| Before Width: | Height: | Size: 138 B After Width: | Height: | Size: 138 B | 
| Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB | 
| Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |