diff --git a/bin/.gitignore b/bin/.gitignore index 8e39425..5313a25 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,2 +1,3 @@ /application/ /libraries/ +/resources/ diff --git a/bin/application/DBController.class b/bin/application/DBController.class index 6a474fe..b5624fc 100644 Binary files a/bin/application/DBController.class and b/bin/application/DBController.class differ diff --git a/bin/application/Main.class b/bin/application/Main.class index 3d68e86..a2798b7 100644 Binary files a/bin/application/Main.class and b/bin/application/Main.class differ diff --git a/bin/application/MainWindow.fxml b/bin/application/MainWindow.fxml index 803f728..12ceeba 100644 --- a/bin/application/MainWindow.fxml +++ b/bin/application/MainWindow.fxml @@ -40,7 +40,7 @@ - + diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class index 6b4196d..16ed07f 100644 Binary files a/bin/application/MainWindowController.class and b/bin/application/MainWindowController.class differ diff --git a/bin/application/apiQuery.class b/bin/application/apiQuery.class index 33242ea..7e68974 100644 Binary files a/bin/application/apiQuery.class and b/bin/application/apiQuery.class differ diff --git a/src/application/DBController.java b/src/application/DBController.java index 9e0be27..9306c0b 100644 --- a/src/application/DBController.java +++ b/src/application/DBController.java @@ -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 filmsdbAll = new ArrayList(); private List filmsdbLocal = new ArrayList(); private List filmsdbStream = new ArrayList(); @@ -198,7 +198,7 @@ public class DBController { ps.close(); psS.close(); }catch (SQLException ea) { - System.err.println("Konnte nicht ausgeführt werden"); + System.err.println("Konnte nicht ausgef�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ügen \""+titel+"\""); + System.out.println("hinzuf�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); diff --git a/src/application/Main.java b/src/application/Main.java index f8a7f79..b853e3a 100644 --- a/src/application/Main.java +++ b/src/application/Main.java @@ -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; } diff --git a/src/application/MainWindow.fxml b/src/application/MainWindow.fxml index 803f728..12ceeba 100644 --- a/src/application/MainWindow.fxml +++ b/src/application/MainWindow.fxml @@ -40,7 +40,7 @@ - + diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index 01dcb88..ceb2c2a 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -240,14 +240,14 @@ public class MainWindowController { ObservableList localFilms = FXCollections.observableArrayList(); ObservableList streamingFilms = FXCollections.observableArrayList(); ObservableList 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; } diff --git a/src/application/apiQuery.java b/src/application/apiQuery.java index f215934..616b0f6 100644 --- a/src/application/apiQuery.java +++ b/src/application/apiQuery.java @@ -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]); } diff --git a/src/recources/HomeFlix-Local_de_DE.properties b/src/recources/HomeFlix-Local_de_DE.properties deleted file mode 100644 index bfa591e..0000000 --- a/src/recources/HomeFlix-Local_de_DE.properties +++ /dev/null @@ -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? diff --git a/src/recources/HomeFlix-Local_en_US.properties b/src/recources/HomeFlix-Local_en_US.properties deleted file mode 100644 index e221122..0000000 --- a/src/recources/HomeFlix-Local_en_US.properties +++ /dev/null @@ -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? \ No newline at end of file diff --git a/src/recources/Homeflix_Icon_64x64.png b/src/recources/Homeflix_Icon_64x64.png deleted file mode 100644 index 64787d6..0000000 Binary files a/src/recources/Homeflix_Icon_64x64.png and /dev/null differ diff --git a/src/recources/Homeflix_Poster.png b/src/recources/Homeflix_Poster.png deleted file mode 100644 index 9f2aa98..0000000 Binary files a/src/recources/Homeflix_Poster.png and /dev/null differ diff --git a/src/recources/icons/close_black_2048x2048.png b/src/recources/icons/close_black_2048x2048.png deleted file mode 100644 index 2d0397b..0000000 Binary files a/src/recources/icons/close_black_2048x2048.png and /dev/null differ diff --git a/src/recources/icons/ic_favorite_black_18dp_1x.png b/src/recources/icons/ic_favorite_black_18dp_1x.png deleted file mode 100644 index 69be1f5..0000000 Binary files a/src/recources/icons/ic_favorite_black_18dp_1x.png and /dev/null differ diff --git a/src/recources/icons/ic_favorite_border_black_18dp_1x.png b/src/recources/icons/ic_favorite_border_black_18dp_1x.png deleted file mode 100644 index 7edb675..0000000 Binary files a/src/recources/icons/ic_favorite_border_black_18dp_1x.png and /dev/null differ diff --git a/src/recources/icons/ic_play_arrow_black_18dp_1x.png b/src/recources/icons/ic_play_arrow_black_18dp_1x.png deleted file mode 100644 index 96021dc..0000000 Binary files a/src/recources/icons/ic_play_arrow_black_18dp_1x.png and /dev/null differ diff --git a/src/recources/icons/ic_play_arrow_white_18dp_1x.png b/src/recources/icons/ic_play_arrow_white_18dp_1x.png deleted file mode 100644 index cae85ab..0000000 Binary files a/src/recources/icons/ic_play_arrow_white_18dp_1x.png and /dev/null differ diff --git a/src/recources/icons/ic_search_black_18dp_1x.png b/src/recources/icons/ic_search_black_18dp_1x.png deleted file mode 100644 index f0d4e97..0000000 Binary files a/src/recources/icons/ic_search_black_18dp_1x.png and /dev/null differ diff --git a/src/recources/icons/ic_skip_next_black_18dp_1x.png b/src/recources/icons/ic_skip_next_black_18dp_1x.png deleted file mode 100644 index 327fd8d..0000000 Binary files a/src/recources/icons/ic_skip_next_black_18dp_1x.png and /dev/null differ diff --git a/src/recources/icons/ic_skip_next_white_18dp_1x.png b/src/recources/icons/ic_skip_next_white_18dp_1x.png deleted file mode 100644 index 26434a0..0000000 Binary files a/src/recources/icons/ic_skip_next_white_18dp_1x.png and /dev/null differ diff --git a/src/recources/icons/ic_skip_previous_black_18dp_1x.png b/src/recources/icons/ic_skip_previous_black_18dp_1x.png deleted file mode 100644 index 34c528d..0000000 Binary files a/src/recources/icons/ic_skip_previous_black_18dp_1x.png and /dev/null differ diff --git a/src/recources/icons/ic_skip_previous_white_18dp_1x.png b/src/recources/icons/ic_skip_previous_white_18dp_1x.png deleted file mode 100644 index e7d7643..0000000 Binary files a/src/recources/icons/ic_skip_previous_white_18dp_1x.png and /dev/null differ diff --git a/src/recources/icons/menu_icon_black.png b/src/recources/icons/menu_icon_black.png deleted file mode 100644 index 19711de..0000000 Binary files a/src/recources/icons/menu_icon_black.png and /dev/null differ diff --git a/src/recources/icons/menu_icon_white.png b/src/recources/icons/menu_icon_white.png deleted file mode 100644 index 11adfa7..0000000 Binary files a/src/recources/icons/menu_icon_white.png and /dev/null differ diff --git a/bin/recources/HomeFlix-Local_de_DE.properties b/src/resources/HomeFlix-Local_de_DE.properties similarity index 100% rename from bin/recources/HomeFlix-Local_de_DE.properties rename to src/resources/HomeFlix-Local_de_DE.properties diff --git a/bin/recources/HomeFlix-Local_en_US.properties b/src/resources/HomeFlix-Local_en_US.properties similarity index 100% rename from bin/recources/HomeFlix-Local_en_US.properties rename to src/resources/HomeFlix-Local_en_US.properties diff --git a/bin/recources/Homeflix_Icon_64x64.png b/src/resources/Homeflix_Icon_64x64.png similarity index 100% rename from bin/recources/Homeflix_Icon_64x64.png rename to src/resources/Homeflix_Icon_64x64.png diff --git a/bin/recources/Homeflix_Poster.png b/src/resources/Homeflix_Poster.png similarity index 100% rename from bin/recources/Homeflix_Poster.png rename to src/resources/Homeflix_Poster.png diff --git a/bin/recources/icons/close_black_2048x2048.png b/src/resources/icons/close_black_2048x2048.png similarity index 100% rename from bin/recources/icons/close_black_2048x2048.png rename to src/resources/icons/close_black_2048x2048.png diff --git a/bin/recources/icons/ic_favorite_black_18dp_1x.png b/src/resources/icons/ic_favorite_black_18dp_1x.png similarity index 100% rename from bin/recources/icons/ic_favorite_black_18dp_1x.png rename to src/resources/icons/ic_favorite_black_18dp_1x.png diff --git a/bin/recources/icons/ic_favorite_border_black_18dp_1x.png b/src/resources/icons/ic_favorite_border_black_18dp_1x.png similarity index 100% rename from bin/recources/icons/ic_favorite_border_black_18dp_1x.png rename to src/resources/icons/ic_favorite_border_black_18dp_1x.png diff --git a/bin/recources/icons/ic_play_arrow_black_18dp_1x.png b/src/resources/icons/ic_play_arrow_black_18dp_1x.png similarity index 100% rename from bin/recources/icons/ic_play_arrow_black_18dp_1x.png rename to src/resources/icons/ic_play_arrow_black_18dp_1x.png diff --git a/bin/recources/icons/ic_play_arrow_white_18dp_1x.png b/src/resources/icons/ic_play_arrow_white_18dp_1x.png similarity index 100% rename from bin/recources/icons/ic_play_arrow_white_18dp_1x.png rename to src/resources/icons/ic_play_arrow_white_18dp_1x.png diff --git a/bin/recources/icons/ic_search_black_18dp_1x.png b/src/resources/icons/ic_search_black_18dp_1x.png similarity index 100% rename from bin/recources/icons/ic_search_black_18dp_1x.png rename to src/resources/icons/ic_search_black_18dp_1x.png diff --git a/bin/recources/icons/ic_skip_next_black_18dp_1x.png b/src/resources/icons/ic_skip_next_black_18dp_1x.png similarity index 100% rename from bin/recources/icons/ic_skip_next_black_18dp_1x.png rename to src/resources/icons/ic_skip_next_black_18dp_1x.png diff --git a/bin/recources/icons/ic_skip_next_white_18dp_1x.png b/src/resources/icons/ic_skip_next_white_18dp_1x.png similarity index 100% rename from bin/recources/icons/ic_skip_next_white_18dp_1x.png rename to src/resources/icons/ic_skip_next_white_18dp_1x.png diff --git a/bin/recources/icons/ic_skip_previous_black_18dp_1x.png b/src/resources/icons/ic_skip_previous_black_18dp_1x.png similarity index 100% rename from bin/recources/icons/ic_skip_previous_black_18dp_1x.png rename to src/resources/icons/ic_skip_previous_black_18dp_1x.png diff --git a/bin/recources/icons/ic_skip_previous_white_18dp_1x.png b/src/resources/icons/ic_skip_previous_white_18dp_1x.png similarity index 100% rename from bin/recources/icons/ic_skip_previous_white_18dp_1x.png rename to src/resources/icons/ic_skip_previous_white_18dp_1x.png diff --git a/bin/recources/icons/menu_icon_black.png b/src/resources/icons/menu_icon_black.png similarity index 100% rename from bin/recources/icons/menu_icon_black.png rename to src/resources/icons/menu_icon_black.png diff --git a/bin/recources/icons/menu_icon_white.png b/src/resources/icons/menu_icon_white.png similarity index 100% rename from bin/recources/icons/menu_icon_white.png rename to src/resources/icons/menu_icon_white.png