diff --git a/.classpath b/.classpath index 64f47f8..bf77390 100644 --- a/.classpath +++ b/.classpath @@ -1,7 +1,7 @@ - + diff --git a/bin/.gitignore b/bin/.gitignore index 5313a25..b42b859 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,3 +1 @@ /application/ -/libraries/ -/resources/ diff --git a/bin/application/MainWindowController$7.class b/bin/application/MainWindowController$7.class index b5e6936..0fed876 100644 Binary files a/bin/application/MainWindowController$7.class and b/bin/application/MainWindowController$7.class differ diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class index a420cad..9aca2d1 100644 Binary files a/bin/application/MainWindowController.class and b/bin/application/MainWindowController.class differ diff --git a/bin/resources/HomeFlix-Local_de_DE.properties b/bin/resources/HomeFlix-Local_de_DE.properties new file mode 100644 index 0000000..aa9c214 --- /dev/null +++ b/bin/resources/HomeFlix-Local_de_DE.properties @@ -0,0 +1,63 @@ +#HomeFlix-Local_de_DE.properties German Local + +#main window translations +info = Info +settings = Einstellungen +streamingSettings = Stream Einst. +tfSearch = Suche... +openFolder = Ordner \u00F6ffnen + +#settings translations +settingsHead1Label = HomeFlix Einstellungen +tfPath = Pfad... +chooseFolder = Ordner ausw\u00E4hlen +mainColorLabel = Hauptfarbe: +fontsizeLabel = Schriftgr\u00F6\u00DFe: +localLabel = Sprache: +checkUpdates = Auf Update pr\u00FCfen +checkingUpdates = Es wird nach Updates gesucht... +updateBtnavail = Update verf\u00FCgbar +updateBtnNotavail = Kein Update verf\u00FCgbar +autoUpdateLabel = beim Start nach Updates suchen: +version = Version: + +#column translations +columnName = Name +columnRating = Bewertung +columnStreamUrl = Datei Name +columnResolution = Aufl\u00F6sung +columnSeason = Staffel +columnYear = Jahr + +#error translations +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! +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 + +#textFlow translations +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/bin/resources/HomeFlix-Local_en_US.properties b/bin/resources/HomeFlix-Local_en_US.properties new file mode 100644 index 0000000..d166f04 --- /dev/null +++ b/bin/resources/HomeFlix-Local_en_US.properties @@ -0,0 +1,63 @@ +#HomeFlix-Local_en_US.properties US-English Local and default + +#main window translations +info = Info +settings = Settings +streamingSettings = Stream Settings +tfSearch = Search... +openFolder = open Folder + +#settings translations +settingsHead1Label = HomeFlix Settings +tfPath = Path... +chooseFolder = choose Directory +mainColorLabel = main color: +fontsizeLabel = font size: +localLabel = local: +checkUpdates = check for updates +checkingUpdates = checking for updates... +updateBtnavail = update available +updateBtnNotavail = no update available +autoUpdateLabel = check at startup for updates: +version = Version: + +#column translations +columnName = Name +columnRating = Rating +columnStreamUrl = File Name +columnResolution = Resolution +columnSeason = Season +columnYear = Year + +#error translations +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! +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 + +#textFlow translations +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? diff --git a/bin/resources/Homeflix_Icon_64x64.png b/bin/resources/Homeflix_Icon_64x64.png new file mode 100644 index 0000000..64787d6 Binary files /dev/null and b/bin/resources/Homeflix_Icon_64x64.png differ diff --git a/bin/resources/Homeflix_Poster.png b/bin/resources/Homeflix_Poster.png new file mode 100644 index 0000000..9f2aa98 Binary files /dev/null and b/bin/resources/Homeflix_Poster.png differ diff --git a/bin/resources/icons/close_black_2048x2048.png b/bin/resources/icons/close_black_2048x2048.png new file mode 100644 index 0000000..2d0397b Binary files /dev/null and b/bin/resources/icons/close_black_2048x2048.png differ diff --git a/bin/resources/icons/ic_favorite_black_18dp_1x.png b/bin/resources/icons/ic_favorite_black_18dp_1x.png new file mode 100644 index 0000000..69be1f5 Binary files /dev/null and b/bin/resources/icons/ic_favorite_black_18dp_1x.png differ diff --git a/bin/resources/icons/ic_favorite_border_black_18dp_1x.png b/bin/resources/icons/ic_favorite_border_black_18dp_1x.png new file mode 100644 index 0000000..7edb675 Binary files /dev/null and b/bin/resources/icons/ic_favorite_border_black_18dp_1x.png differ diff --git a/bin/resources/icons/ic_play_arrow_black_18dp_1x.png b/bin/resources/icons/ic_play_arrow_black_18dp_1x.png new file mode 100644 index 0000000..96021dc Binary files /dev/null and b/bin/resources/icons/ic_play_arrow_black_18dp_1x.png differ diff --git a/bin/resources/icons/ic_play_arrow_white_18dp_1x.png b/bin/resources/icons/ic_play_arrow_white_18dp_1x.png new file mode 100644 index 0000000..cae85ab Binary files /dev/null and b/bin/resources/icons/ic_play_arrow_white_18dp_1x.png differ diff --git a/bin/resources/icons/ic_search_black_18dp_1x.png b/bin/resources/icons/ic_search_black_18dp_1x.png new file mode 100644 index 0000000..f0d4e97 Binary files /dev/null and b/bin/resources/icons/ic_search_black_18dp_1x.png differ diff --git a/bin/resources/icons/ic_skip_next_black_18dp_1x.png b/bin/resources/icons/ic_skip_next_black_18dp_1x.png new file mode 100644 index 0000000..327fd8d Binary files /dev/null and b/bin/resources/icons/ic_skip_next_black_18dp_1x.png differ diff --git a/bin/resources/icons/ic_skip_next_white_18dp_1x.png b/bin/resources/icons/ic_skip_next_white_18dp_1x.png new file mode 100644 index 0000000..26434a0 Binary files /dev/null and b/bin/resources/icons/ic_skip_next_white_18dp_1x.png differ diff --git a/bin/resources/icons/ic_skip_previous_black_18dp_1x.png b/bin/resources/icons/ic_skip_previous_black_18dp_1x.png new file mode 100644 index 0000000..34c528d Binary files /dev/null and b/bin/resources/icons/ic_skip_previous_black_18dp_1x.png differ diff --git a/bin/resources/icons/ic_skip_previous_white_18dp_1x.png b/bin/resources/icons/ic_skip_previous_white_18dp_1x.png new file mode 100644 index 0000000..e7d7643 Binary files /dev/null and b/bin/resources/icons/ic_skip_previous_white_18dp_1x.png differ diff --git a/src/application/DBController.java b/src/application/DBController.java index 91ebfab..3b841a1 100644 --- a/src/application/DBController.java +++ b/src/application/DBController.java @@ -632,4 +632,3 @@ public class DBController { } } - diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index 37b237e..1b72bb1 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -192,9 +192,9 @@ public class MainWindowController { private boolean autoUpdate = false; static boolean firststart = false; private int hashA = -2055934614; - private String version = "0.5.1"; + private String version = "0.5.2"; private String buildNumber = "129"; - private String versionName = "plasma cow"; + private String versionName = "solidify cow"; private File dirWin = new File(System.getProperty("user.home") + "/Documents/HomeFlix"); private File dirLinux = new File(System.getProperty("user.home") + "/HomeFlix"); private File fileWin = new File(dirWin + "/config.xml");