From c6f51fbc76594a973c7252f953fe36a1bfccc742 Mon Sep 17 00:00:00 2001 From: Jannik Date: Sun, 4 Jun 2017 20:13:04 +0200 Subject: [PATCH 1/8] clean up --- bin/application/DBController.class | Bin 20428 -> 20430 bytes bin/application/Main.class | Bin 7044 -> 7044 bytes bin/application/apiQuery.class | Bin 9400 -> 9400 bytes src/application/Main.java | 7 +++---- src/application/apiQuery.java | 2 -- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/bin/application/DBController.class b/bin/application/DBController.class index 9f604cfb1959e0ac1469a828e3b40f12d3ebf22f..6a474fef8469b95ff5cb3fd7b5867161bf6e7d54 100644 GIT binary patch delta 54 zcmX>zpYhy$#tq(r;tJmRd3hzN3VE5y86^sdrN!x~Y47*%-JB?B%g)7@k(pOj3g$1D HP&EetQ7{%4 delta 52 zcmX>%pYhCm#tq(rV)EYkd3hzN3VE5y86^sdrN!x~X@~c0P7<_b=j6@E%&RH|aaT&H GngakA3lu&8 diff --git a/bin/application/Main.class b/bin/application/Main.class index 9a4b3ac0f8ebdd03b616b2cc85b3143926c6fabb..3d68e8667681005dad9a5ae5a4195e44d53e46fe 100644 GIT binary patch delta 396 zcmWNNO-R#m9L7K2Kl@+QSki24JB4%@!Da~?#bz0__2#UDh_1=BH+5}L(3%b1u+@mM z)c)8TtrSOx2_YLuFAN49cFT@QT@t~IgwWMPzuUvZ^E^Dylk?`hYaYu{Cnj99;N~D* z9OgJDIYAHIoKq;uDbhHNuqAw;M=4Iz!5M7y*1lOHS|)&*AXd(EgbN(wqOx7W$7Kcy zF-AXeu8`s?S%xSw%v-|LxkiHs8;r2WsI+rk9NdsjZi&FS&T?PMBxRKcQY9synUV$%rAb=8Gc7-vku5T^OIH3dEBoX$6OXl4 zo@i$B+996S{#cXJS5zlFQ*GvmF;9X8HTpR-7!-KP3tp+-uc`2cPYTs3(c~RJSYng+ z{9>7HR@kA;Up^RRTS>2|#8o3;_sK`&k=?IX(Wx0Bht>FPcgwob=J4xZ6!%qep8s^1 BU*iA( delta 396 zcmWNNTPWml9K}E1f9Ay{WSGo6ZSrEvWr;9Y%5~jKYR4_D>nw^ImUYWDa#?@mHWrN( zii|?LN_p^xN8*LlzGzckJ@~zz&N+R~8H^i@+mAJdhT%a3ob@UeT(rv$9df`AIiXX|=#mS5$|XH=L$5s2C(rcDD+BVzkmkX#=EaES%cvH>nES!x zki1EC!jvMK#?CLAnNg#4dYEOL1?E{)+)He;%rQ>Izsd!_xn`YP*0^JXCtUnvlmBe# su3)EOM>X#18D^{O=>z5@gBt^fdcMV^--#*PCn=VM3tbshv3Hg!#L6XBR99&#{PVe6J@*{raystB{<}H)-@~nGRHoO{}rkRwPAZ_AonG_jQ zA!|O_wvFWM7&~^3yiKxeefI1-1^dOm1Sm+51L@~bMmUnVc7#5W{-7Qg2r{5PYJZXPS7SgI7Ylr58fc Ef8$e6LI3~& delta 290 zcmWN{%`3xk9Ki8+>-YP9zDcnpTnIZjnB=h}rCffOU3PJCk+Q_W$#F-wVKZi^DN&wU zdHS_!%AzR``4=QP?83pt#pm?yT`%ABy?jr5JmD;|;$&HM%B(q6l5Qg@cZ_v6M%qoX z;oh+6ev&cuY?%?VW`=E(V8{6Ens;*Mi#-XDlOX%j%Yh7WC^794$Fj_cq&bxgXL3Yd ze44cZ37MCu(`7ffw3%CB$25 HE)@9(A0AJz diff --git a/src/application/Main.java b/src/application/Main.java index cff2f19..f8a7f79 100644 --- a/src/application/Main.java +++ b/src/application/Main.java @@ -27,7 +27,6 @@ import java.io.IOException; import java.util.Locale; import java.util.Optional; import java.util.ResourceBundle; - import javafx.application.Application; import javafx.fxml.FXMLLoader; import javafx.scene.Scene; @@ -43,7 +42,7 @@ public class Main extends Application { Stage primaryStage; private String path; - String currentWorkingDirectory; + String currentWorkingDirectory; private String COLOR = "ee3523"; private String FONT_FAMILY = "System"; private String mode = "local"; //local or streaming TODO @@ -61,12 +60,12 @@ public class Main extends Application { @Override public void start(Stage primaryStage) throws IOException { currentWorkingDirectory = new java.io.File( "." ).getCanonicalPath(); - this.primaryStage = primaryStage; + this.primaryStage = primaryStage; mainWindow(); } private void mainWindow(){ - + try { FXMLLoader loader = new FXMLLoader(Main.class.getResource("MainWindow.fxml")); AnchorPane pane = loader.load(); diff --git a/src/application/apiQuery.java b/src/application/apiQuery.java index 0196a0c..f215934 100644 --- a/src/application/apiQuery.java +++ b/src/application/apiQuery.java @@ -138,7 +138,6 @@ public class apiQuery{ im = new Image("recources/icons/close_black_2048x2048.png"); mainWindowController.image1.setImage(im); }else{ - // nameText.add(0, new Text(mainWindowController.title+": ")); nameText.add(1, new Text(mainWindowController.year+": ")); nameText.add(2, new Text(mainWindowController.rating+": ")); @@ -156,7 +155,6 @@ public class apiQuery{ nameText.add(14, new Text(mainWindowController.imdbRating+": ")); nameText.add(15, new Text(mainWindowController.type+": ")); - for(int i=0; i Date: Sun, 4 Jun 2017 20:24:08 +0200 Subject: [PATCH 2/8] fixed typo error --- bin/.gitignore | 1 + bin/application/DBController.class | Bin 20430 -> 20430 bytes bin/application/Main.class | Bin 7044 -> 7044 bytes bin/application/MainWindow.fxml | 2 +- bin/application/MainWindowController.class | Bin 35471 -> 35471 bytes bin/application/apiQuery.class | Bin 9400 -> 9400 bytes src/application/DBController.java | 10 ++-- src/application/Main.java | 8 +-- src/application/MainWindow.fxml | 2 +- src/application/MainWindowController.java | 22 ++++---- src/application/apiQuery.java | 4 +- src/recources/HomeFlix-Local_de_DE.properties | 50 ------------------ src/recources/HomeFlix-Local_en_US.properties | 50 ------------------ src/recources/Homeflix_Icon_64x64.png | Bin 24056 -> 0 bytes src/recources/Homeflix_Poster.png | Bin 30665 -> 0 bytes src/recources/icons/close_black_2048x2048.png | Bin 9502 -> 0 bytes .../icons/ic_favorite_black_18dp_1x.png | Bin 214 -> 0 bytes .../ic_favorite_border_black_18dp_1x.png | Bin 261 -> 0 bytes .../icons/ic_play_arrow_black_18dp_1x.png | Bin 131 -> 0 bytes .../icons/ic_play_arrow_white_18dp_1x.png | Bin 135 -> 0 bytes .../icons/ic_search_black_18dp_1x.png | Bin 215 -> 0 bytes .../icons/ic_skip_next_black_18dp_1x.png | Bin 128 -> 0 bytes .../icons/ic_skip_next_white_18dp_1x.png | Bin 134 -> 0 bytes .../icons/ic_skip_previous_black_18dp_1x.png | Bin 131 -> 0 bytes .../icons/ic_skip_previous_white_18dp_1x.png | Bin 138 -> 0 bytes src/recources/icons/menu_icon_black.png | Bin 14700 -> 0 bytes src/recources/icons/menu_icon_white.png | Bin 15139 -> 0 bytes .../HomeFlix-Local_de_DE.properties | 0 .../HomeFlix-Local_en_US.properties | 0 .../resources}/Homeflix_Icon_64x64.png | Bin .../resources}/Homeflix_Poster.png | Bin .../icons/close_black_2048x2048.png | Bin .../icons/ic_favorite_black_18dp_1x.png | Bin .../ic_favorite_border_black_18dp_1x.png | Bin .../icons/ic_play_arrow_black_18dp_1x.png | Bin .../icons/ic_play_arrow_white_18dp_1x.png | Bin .../icons/ic_search_black_18dp_1x.png | Bin .../icons/ic_skip_next_black_18dp_1x.png | Bin .../icons/ic_skip_next_white_18dp_1x.png | Bin .../icons/ic_skip_previous_black_18dp_1x.png | Bin .../icons/ic_skip_previous_white_18dp_1x.png | Bin .../resources}/icons/menu_icon_black.png | Bin .../resources}/icons/menu_icon_white.png | Bin 43 files changed, 25 insertions(+), 124 deletions(-) delete mode 100644 src/recources/HomeFlix-Local_de_DE.properties delete mode 100644 src/recources/HomeFlix-Local_en_US.properties delete mode 100644 src/recources/Homeflix_Icon_64x64.png delete mode 100644 src/recources/Homeflix_Poster.png delete mode 100644 src/recources/icons/close_black_2048x2048.png delete mode 100644 src/recources/icons/ic_favorite_black_18dp_1x.png delete mode 100644 src/recources/icons/ic_favorite_border_black_18dp_1x.png delete mode 100644 src/recources/icons/ic_play_arrow_black_18dp_1x.png delete mode 100644 src/recources/icons/ic_play_arrow_white_18dp_1x.png delete mode 100644 src/recources/icons/ic_search_black_18dp_1x.png delete mode 100644 src/recources/icons/ic_skip_next_black_18dp_1x.png delete mode 100644 src/recources/icons/ic_skip_next_white_18dp_1x.png delete mode 100644 src/recources/icons/ic_skip_previous_black_18dp_1x.png delete mode 100644 src/recources/icons/ic_skip_previous_white_18dp_1x.png delete mode 100644 src/recources/icons/menu_icon_black.png delete mode 100644 src/recources/icons/menu_icon_white.png rename {bin/recources => src/resources}/HomeFlix-Local_de_DE.properties (100%) rename {bin/recources => src/resources}/HomeFlix-Local_en_US.properties (100%) rename {bin/recources => src/resources}/Homeflix_Icon_64x64.png (100%) rename {bin/recources => src/resources}/Homeflix_Poster.png (100%) rename {bin/recources => src/resources}/icons/close_black_2048x2048.png (100%) rename {bin/recources => src/resources}/icons/ic_favorite_black_18dp_1x.png (100%) rename {bin/recources => src/resources}/icons/ic_favorite_border_black_18dp_1x.png (100%) rename {bin/recources => src/resources}/icons/ic_play_arrow_black_18dp_1x.png (100%) rename {bin/recources => src/resources}/icons/ic_play_arrow_white_18dp_1x.png (100%) rename {bin/recources => src/resources}/icons/ic_search_black_18dp_1x.png (100%) rename {bin/recources => src/resources}/icons/ic_skip_next_black_18dp_1x.png (100%) rename {bin/recources => src/resources}/icons/ic_skip_next_white_18dp_1x.png (100%) rename {bin/recources => src/resources}/icons/ic_skip_previous_black_18dp_1x.png (100%) rename {bin/recources => src/resources}/icons/ic_skip_previous_white_18dp_1x.png (100%) rename {bin/recources => src/resources}/icons/menu_icon_black.png (100%) rename {bin/recources => src/resources}/icons/menu_icon_white.png (100%) 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 6a474fef8469b95ff5cb3fd7b5867161bf6e7d54..b5624fc54b82416f70b4b83f99d0ba4ce5930d7b 100644 GIT binary patch delta 33 ncmX>%pYhy$#tnQdjKz}!S)?XwvZyl_Zw_RMlm}9)m6de>yq^j* delta 33 ncmX>%pYhy$#tnQdjLDM&S)?XwvZymAZw_RMlm}9)m6de>x&I0T diff --git a/bin/application/Main.class b/bin/application/Main.class index 3d68e8667681005dad9a5ae5a4195e44d53e46fe..a2798b7280e2397b2db22ab47cb7606c9d76378b 100644 GIT binary patch delta 21 bcmZoMZ!zC+m5s4@^EEbEb|CeIcLFZ}T8Rhl delta 21 bcmZoMZ!zC+m5niZ^EEbEb|CeIcLFZ}Sy>0p 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 6b4196d3e1b1e8d829ecfe6e03cfca124f503388..16ed07f51f95f7d1a61d432a013e1108eff32f2b 100644 GIT binary patch delta 73 zcmeC5%G5uVX@k57WAS7Kkwh>lK6$2yG?4XOL~inB5oIvT5lC8!+5*XPFu7IKjSsR delta 73 zcmeC5%G5uVX@k57WAbDLkwh>lK6$2yG?4XOL~inB5oIvT5lC8!+5*XPFu7IKjxl-j O7ttw7K&sP%EeHTyh!>y$ diff --git a/bin/application/apiQuery.class b/bin/application/apiQuery.class index 33242ea08f87fec2fbb0c78695b1122bc22d7c43..7e6897450aecc092aea0880f80e92160bd767d95 100644 GIT binary patch delta 14 Wcmdntxx;hA4t~bs%{%%3ivR#J!3KN) delta 14 Wcmdntxx;hA4t~bu%{%%3ivR#JVFqjf 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 64787d6596cf95c8c1edd64d0a66386159c7a408..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24056 zcmeI42{e`6+wgChg=C5h9YdyYIOdZfj!cm`V{x1T84kxx#!N*dGa(5X8%#+9GA4w~ zQ-+c`BqV%CJrzAYfB*mczTfw)cP(e(cI|6l*WUZLuf6YU-)F7+iq=_W3bLbQ002;^ zswnE7#G6EHR03dN6z@C&EY<|n^O)myznHeF9v-ZyWSbjwcUFQpW< z5?7Lt$Ek>Di}{h~D6k%Wd%3=*Ze(2Wls_4#13*Pmgk*Et;J^b`eWayNuvZd41Mu8C z4w3+s8p)MH%pqHcrW6uQ@%#euDxISw&ye`h0;fD96taL*N_c)L30%6sEds#231Kk? zXbAx3+`jKS0Kb&gL@zwRB!-O+?^YB5qCtf!0#+x1{MK_OzCYJv|(D)FIoIj7WV ze-jb`M`8m5K~|m?)gvcp#o-6wNv8y>JrWrq{-TH8F1-SPTTyhl(JpPcw@?rBesIxIzmr6McAK}4&kY2=~H%J352Hr<1e=R$>^_8WAy++ld+>noUOq<#w=|hKB^-&+76>tJ~JR+=lY4 zBo#U=gkjL;0bQN&%$R8eshXNv{KtDINE_yuv-5SrHsR&FL097DxN3)qy+K}Bs6fg zzEC`itA-pABu5g1R@tgl2<2L5-ob+U#ed#8iZJuIhpGRah2fum_|Hj$S);yHdNo4#y;aPO_-VQI6=wKBUb9Pg~^j`HZdyr{2NMnV9^irLB+97vo zL|u}knlICWI~f^}P?yj}H&VvYw59ZP4B{sr(`S1O6vBa*ANO%k`m_ zJdDW<#0-{*eHT zTwpzB?zq%Wd7mP7g`E>AxgB>HQ=8nl_&CEnl|1b{<>{y5 zg|pcySx-+_7_IwL%GaxLn{q2#Mz#>9Oz8IN4rY^O(`(2;mkR}RZ8DkCD-_+H+h@-u zq&~agm#U7*9`blP@rBtNyrH*Y_a%E-ncR@5h@6wCpS*=Zx>n2)Bh3P??_bb{oqur( zmI;rA$BzU?mA6S}bShm_IuveQXFA3?W>;rdm%&BE#m03;V@hK#Nk^kRi#O|}`bqWr z=2y+Po4XRll4XRuArr|H$=%7rW#-22#{8vsOCOOlGPZYN_{GTm}l;PXdh zKg(j%#$?B&C59kFMrN-hD$5$mnlxWvQq6*fVZIz&$Su#UHXz&YIG!c`6@PhulLPCk zo|o93N610@QJ)|7&dP`1Dwn5|j|?aXcvn@xX4Nory?||HBB3R!#hNlm%jZMaYhw6& zc-RXca_*pzAcJ7J2!~L^qiw?RVs32%FsEU~FN$%BL&=uHno{=!)WrB?a|JI-_ene! zeJoceh&FoFX_#WDYI}xRN|3Km+}`%t@YmU;kkORUgJWJt62J}T9X!%osy_u~)8`0M z^F!lKsfV7GjQJ=}#dnuJ{P-e`+wll8k7|}`OLlOZcw1->%#@Gy?4k;vhUbl$s3&3` zoV6mE{O`&GxpS^RQKwKJOopb?C%J;`ATrRW!k2GEU3XN-Wz&c*wVbkik9KX!M+H6H zthEm-1GB~wH`)|k&nGkzAS+eK`k-gb)6GZx&=O^Ue%^fLrBqyA>WSvrS4A)TuS?vV zPurTMuBINjQJNWi#z26@@cq;Li&77z9X3> zm#2n}|AnfT0aYb&a))na+NbCo3DWjnDe^ z@$@x1(VeJu)%Btkxxy>CldEy-cIOMu+BweFj$^JYmMq|l3Q3DeO3AuO z>n0W^k2PP(wslPnd45&yKX&M*sI-xX+LB(Qb>Cz_N3`W)Yj{d*inov8+JJfg?NYA^ zM9c8SLzwx;RL&#qr?P(fA8GO3riCL*#Sstbz^ucm(v@})px^d4H zJkfk&_UY8Dd@pP;q*KmhbD(E_!1rRM+pVRx0p%5p?32o`|i}BIV?Ji|*OjS-Z-s`Wc zu48@H=q@6B;nTVG*($dIHo3yPX3r5d{EgId=y*!Up9GvOrl{+sm-eS3GA2StDiG z4a78rG#p?kD{B=`EK1k&tRBMC1|fxHmy;!vc8B5|*rA-^Aa^@kdnc&74Er~~P~899 z#b9>Ow<^vyGVJo(4T20cv_LQn76lR$6c<1Ui$FjUQi8%_QV>Z|eh@@RSR5=Q3Ko_U z5Eg;renf>pe|^|x$#DNkW07d6j-t|E&EX^&b}MIR2Phcq=H@2oCL)NzTH?&5q`*QD zFa#oit0CazVebrg7qEBY`0nI~A4QZC0&DHyY>lx8ZTp2=U|gJK*x9!m`uX{5Ty_pW z8?tx$iye+4*d6Ww78Vo&|H%l6_-W(dg0=nDH6#LzvPIdU?46x(cEW$O!y(ns_-Xpb z=IreLXzAp9+7&l~zli+N(n-(50R`4UIbmF|2-Im;Tu(Uu)Ojao9n>$l|As4E^*=gt z_;Hl^bH9G7{}H3JHToYqvaR_?GnBjaKbUQ6zMFlEsqa%QjiU~QVNq~r3|0?=v6cNE zuD=dqxN{gTJjDdXKs*N4_DGDI6R$M*ccWjS^UEJf5$=qV-41O5AqfFtVLf39sE`;` zMC61J1S%x7!^!uWzxmL>Eh8k{8UDK$2m}fdhKh;p^s=k&?|v{yYqZC|<>gn+9X^l< zC>n#cgFDMw+rceSUf9q=Y08k_Z8`6hce@At{O$khBoPjS6icY9WOZ6%#`KY~l}Y{??R=wG%G# zJa$ARE-t@qce*IY-K9Siw$|UaEeAN(3AMedW!Qf#>!17F&uwhm=G*Q7g(J2%JXyqc zsH2e5;9aG^y7klYFEi`EPv^gf;Jg1F=KtJ=n-$9bUoDjHuD;d!XD3b=w6hx=i;}m* zMaaLmiog5aZTNcw(%|h|gst`eg{g3YyZ-kk0x2pkibCSn6%r*bEC3hA#i9iQEg>K! zAtHr_NTP+s#f5)N^nZCGq@WO~AA8OJ&x!aI$p|aBy(J1M3;r>-9|ixb<_?ZT35kn} z2v~?nAO(b^L@fj)Ma9qp2)Ko)n1zTi3MC5pF~0xO-2Hx^*q^(fTOh{X6@~pzHbLB0 z3&*9kD6Eq#8jG<5!5tiItr76;4HfKakNhhy{COV&Ib%ROZkFH4@9^>eFiw#uto47g z%k1bS;s++s|FSXvxA)b5FJJjSt@~^9N5=5|PPsd4`H^h>JMCPbd(i9s;6P% z!cyYm0uVu5%JIi~fAsSs!HZ=Xb=xHKP^a(=rT$l?b7x3V1r|E4qCPS11K5aW5<$Mc~@1?j0MYv~F;GYkv{uVtywygir z>#q_0kGkFMY`>A+Job?GaqR(Uw|XDfZXSC``?&T1v|GK8Yd4QQq@5&~EiUuH8KLkoIxy0cf{+AJ=Xkdr14Z_5ie7y^m`*k3FP)Tzdf8t=`AAo5vo~ zzr;oM>$MLkd)&Jo+;A^-P`=S0i+dpi2%(~*0RW!I0l@Dv0IY4{u9E=ZA_M?a<^TXq z0DvQy8)mgi06?{(swl7L-Z!4?aox1jrOtQdS>{UWoRMhQIZ*`?ie&zPz+Sc*SKuVq z+ZsxS5P++$!MzqzNT&Ldi>`ti##efU!u90>eeLa!3gK*qb%qLL^nJ&b6h!)ziZoX~ z4Pm6#GKN($+Qg~V{9hM%b`IW~H)(NeU27?y7|2r$6e-W4nZe+{e`Isbapii(fM&#N z<%mUA<>@@G0nDh_(4%?5x6C7q+!TJKftOo7XFkpZ>tWF*xrJvHoo~rcF(`aQGs>ObAI6 zz+fslfn$%VI;S+~%}!N5RM+D?aE;=+{aYgg%zCm*|Fa6uCYvTdILM9DPD}Z)EM>9p z!g&MVk@@Vd;a4pzF`rj%l-ZK^6BWqw#ynXwz6EHLDORp541}DlPH=H_#h0Z`%__- z5+9HOB)rvl#25yuUvCr$I*KUxb4sQsu041J4xgKSUM`jeL1QDDXx2+|aeYim)$=w8J#{TA`*Z)0|F>qfsP1;<0ln zchm?+-?7gOse1DVfa{&@E~=wB05+G?ki}=yQ#3_t5pDnlj8~x-?&G*=5hu}d=lRUX zqP!uP<1|_@wEE@73)^QH-sP2n`rKv{N#FY+p(gLjt?-|wnY>&g4C(H|RF`kbmkzs& z$a!xXn9d(@uO%s(J!r=6GHv&DERU)D?!9Ew2QQtO z*8>meACO;Q=AGGGwwjy-oeU&>bpcx96J*-U20PLkHS)IMJjCF$a#XC`m-I^?PRhlE z-FvL$(_W%X+mOZZ@O|OQag+Xvag(O_CJBS5>}jeYr;V?peBEP1L#4mY&Xa(ig@$*1 z(mAJiJ$>Z@@AT>MmR2wwwY3qoZoAjHjQqJij>xUiBMS9FH;8yoM{OE(H7Fb8-=GRL z71ngk5-=*u)P>5fNv$2EQsqc4wU2f4M&}GHEv&!0(wuUjA?qL-SJ8|t{-yx_!G6^0 zs1(F`fjR2LMANW_jr(CqCZXjA0U*4Zz{hQejl&rEv#X1rd6Rr}$77$h6uCd@yZZ9- zp@;5jGG+w~`AyYN?q4A;4pE|aM_S4rd-y=JNL=*in6-ShF9V_-Us9#7H_QunYFiHN6+2t zMVhVB0dkCji$(t0>IK%t%}M;&yH?Rx31SZz5DXvTFW~Wzbu~Ygth~g@p`E3X7R*PV zu7f&FI)%`_0FF7uTWI%=@gD{1bZa=tqhJLPEv2=?sm6uAR6r{<7T3Dordb+u&>PxwiwM&0&cL zBA3aF3iL8%kzEa6v;y>^v6n|25;pziA3uJqrN*Mp#v61bu#?r?B&plKBvo~*Wi~t_ z0y~*Gf9Kx4w5oJAh0>q{UF72`$D;>ahc{+ylKqpLie4-*x=Pcxq(%0&tCbpN9qYM} zdjn$A`G_|QtwHEopn)fD~aYN|ri^QSAUHzWoskC+X&(%$03R_a^R z!U-e5Jfecv!)qCOCEQ)YOOh>9MS2d-f-G z2Pq~=*qYesA{QhgrK?3WW#uIgXOaiTgnQLh5d`1uI~jxZFh*B68J?tEDP`ot|zAoC?2tE4>-|AE=rqP6!cK9wwG!)GOFWwlski-++pR0)YD zs>ivrSA{c*7?oe73r=tIuOoTOM;KgHPfb6MQMsQzWzN8LQpBi*W+aO78WQM^$G3{S z2jjgsSD?q!cB!rQtNpuq!>8Ee2k8ZF%gw(DxbHYWLDYAvIIC&QN z(Za@M`3y!f?Hs*Ev`9~B5E*N3O!bO%ZYLkGv9a+cQ%8jgdolBh@@*2W1=Ek-RQCnK z3^}hJ()$XsD7GVdm=WV&Z2d;zT#o;3KP=TgN+rX<8IA7lJtw4_p@(v^xJDNw zS+B2*e60;*Xufu%6`j!0R^?imL?=`wHb_#kz~OYcQFjW$1Y8+M)~X)d_*SgsWoJenB` zevs}&tV&2o*coR%v)-sHc}-&gTT6F|h3908V-aEuPmhMh6>9ns{ zuW9`kwJ+Jo)4~JYJuruk%^$7Oc`Znle8WPXKQLRg5gTP&9*~mHVaGU=C&{4JhBn~| zd7*(Q3jk(rj~j zjaT0$&})>|zTMn-^7bNn?{d517nhEeyy=HRBN1r-9D1 zTso_Gg88tkfoV)`@5coCxm;+-qoHtd)r1o3`BUX;Pjaq!sYeHp#D`s9k;XpLN>xni zmi9SK7|a}*05*-f%0}h`P2jLQ`X=$Q(mD1=G}Pf!48h!E6B#sylO*HbhNJCTS|2aA z2NhQ@1kC}QfC;ayexBo9)p3GOWWcQeFp`hbpsRM(>P*sA68s1^^E*S~%+Hg6_8uv2 z!}8k^6FposWRbpphsfhuS|a-Rtu<&ml4R(JbyMP`#Kc(rRPW{Jk`bMtyq49tq1#cc z%>TG)ZZZ}j$8ep`8*=(EjF*U+81{B9PIO*fsYl<@L2+m?7UdFHysG;2VGeCZp=Q;> zqjKIxFDB|w=VY*{kse=qE_=eP9bxiDfwr|HQ+hEcO{RD}F@jQOp~qw+@auX$-Wf6^ zMoo-7Y$|UPI@8x4Sc1kZ7pO+ak7w7Z;UNI`0O+KC&eLr_-L-MvPR;zIEBJJTG`x2m-4#p3)O$-2&b zFlQGrb(I9u!&OblOip|z9A8Bj2c{cEgYPXWb`dc<0Dfdbi&mKT^%=E%y!|!ty2{YY zbRp;_3sn=D4%@J~hc8r#LELSZZneDr1Ql$Jq~D6}TU=W-wEO7yKF)h`((UQmyv^B? zu{BBT#S1zo8oXFZ3yfmIg+|wG1>>$T9@Wj;>Ry(jenrWoae1B`?OUEP^Hrn-wbY^r zF#8!CjBSyMTT2b1xbkS?(W9GuRJ6yRi_4$C9&XN8``&`^%n1eK6zXdyEnJwaiZoK2 z={?hqw#Wf976X*jVVx07#pycyukZtE_KGP}6Eq6-9Y1dJV=sN*O$PBOsK zG5bGC*PJ|hnv@zWP}+E=yuCqU9deAukcDKPg~IQF+~*A|p0aY)yrB55`VMW~F)!?g zb79eM!XHrOk9)of?|F5wKfl$0(eeD$D+!|N1ZpESZOl-F^>K5PWR>8xD@^%lb zTp$p|fQ+#$=Sz(*I+*M|lp#k?jgNf^@FJtvT|c1RU$fx-tUn&5S({!9xgPCT8Yib0 zSaQI>MJ+Zhk~XeDAm$i;DS^-P8dCDxr|rh{SR4k^y10k7{J*S@hK-KYO@21aT&5K& zCh3EmI&p!a;X%0`+wEmi8~xLP@NNXAmc_k9%f~|_{Ry)>Uc&)GNp*kjg4#A9oZ$80 zPS4GOP_ev5(If(LDd&5`QJ*(71^^F3Uroi@VlE4wNq(tE?0k2>GSBuc9N?*J^=KcS ze{}x1S?K{Ld=oeP61n`&M55H235C~YkBSAfJ{abHIJux=&T{a6#)iZLDSx{Pyjn>b zJMaAS)Q6TnhI4I#4rk4{*SC^I+H{gi=qod@xRA?hBD3$Rj}FwVtG@)@(@^x#G&xF! zsu9;D@#DCbrB0<7k?JcswUY6UliTU++3S2Y%GV#lT9y`qBnT?4J8uNXRV3>U=p0k_ zkku|29s&&27A&u+S{RRnee|#6B!zXHcO^G5h)K6Ob7&I-^sI(tP2NG$Y`;KL_4HZA JLIv}H{{!&({3!qc diff --git a/src/recources/Homeflix_Poster.png b/src/recources/Homeflix_Poster.png deleted file mode 100644 index 9f2aa98324adbcda5d666971a96114811a3b62e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30665 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 n=5IaxAO0X|5#;pxJ^-dpTFx>*NT diff --git a/src/recources/icons/close_black_2048x2048.png b/src/recources/icons/close_black_2048x2048.png deleted file mode 100644 index 2d0397b310948819f95bc522b2dcf28400d46249..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9502 zcmeHLdu&r>6hF76>#)p%V8M;7i}Nu}MPd*}c(f44HXjpFVgYd_m?*wBQ4mD97Zeo{ zP)Uf!R|N&1P!p9HkzOPbVhnCR*aYJ0D|Vu8iDitA_Vb+cwPPK(tPEn%w11qQ^WAfP z-|w97eD~h(uAEX;o_9|EIRKDXSutrUKrX7ekZZ=j6^n{Z_&0LObvKvce=mO97Th@x z!_IqfYSm3pSbL=6+V*?IHEjiDm6OZka~DLf`U&8o6_t}F+`LfvbKiuj+sgY-uK!J& z+pn>zE%<%E>Pv3S`PHl5|JC$~AI>=PNiPUwL$VdfR=}_V?an11-=*)iwEx_E)U^I+ zblxznQdC!0yTIEZ8g8+{^M{*E+UnRg(B_IOps`WKp*F*zMr-WVE5ReK(3aGRqb7(n zna;AIyd*C#B&k~J#P>+m9YEr{ZBVD$e9nlv0{}A~IT3Ry2&;D}T6`wdek1mpXgIV< zyljDJjiO&K#@HxL?Zx;*4hRQvv}q>z1?p-I2l>UP?5f3&^yH8X^d$ll{!Xt1ByhsC zCdQNa%M#-mh9}&Dmev=TXA-t^T+T8RI$onRdV4v69k4U!6Tpq94kYI`zTEBV+2h@f zSkep*&OCXsK6M$>);*)rKvd<82<;Y$zUT6(P#LuRs z3U+a|AQ`Mzb#!T9Src*6wm8hPAZB&p_FyR{vvW4&e^xQKmDYPPP+EqnJC__3mo_xw z)J@?Dq!t>gMKoG6ksK~euTpdACXc}83UG6wq~>yQKcd8bL^jxuB(WdK`Q#zvpKXcS zTU$;8p%;^8Lr!&>{u33$=eoI%7Y;_8MaLUYc?x^W>EDB$m`2Sf2kj?vC>fSk1zS;t zPy+C9#0fTkc@HYJJ=i>=IA+yNbQ?xVJ0$>Px5UjpW#N8lyvxQuX}rzG*V1^CjlI&? z#KsrWc%6;UrLlpH&!pjJV}~?eA;YynKtC@OR?*ZB+?_ctSi4Dp7gmMcV0LKMZ&Yw; zWmo{krq5}1gG0}c+Vv+bq1Px;pCxAXeQ9c~h}tzvXk|Vn(&}Mjku*x#m@AFpY)qF% z2^*EtC}Lx@G={KonKb&dae*{)+2|_`VB^?oN~ClL%Ox9$`?*_5?)?E%aA+G3kz6;5 zokJ`S%8-vZWWEe}k3$Y}NHK>Dlp#8YY?mRtIHmW>kasv_zntZFo@FFE`$-PpEZ`m_ z#%uE>R;~bvy+t7pU;%R+S}}#_&&SPy<(81fA-Edv&Q?l!X-a3wSr7(u*(YbA1<=-A z&9nGe-YSW$=Uk@AkT*EwTbT=o43r@r4jCJ@`xGxk?H-(XM5loZ=;~tB;>w#`V8y0z zLClIfq)r9gENRu9{_l=HmNYji`wbc9oe{C zJ;HQDmg|{GxiUlc+}pW&IlzY*dN&6;&GDhC_e0UOmNNlE=PNBfM?p4TBmN0+VBv++l23{@1NRG z6MpW*V?KmBHvi?m!8sVh;=no!c-F+#M{t#X35)sD5ueu1^DMQ}pyu@IGvpwB*BYwJ zanylLa42Z0OeQwh?(+O;jxMf_qCT9m{N?94)^2SOD(B#?vgdW{*ig;I$3LDV$)O~@ijy^;(3u_umERAOaFH>!z!bSC5?c_wy zNUtQx3h9+h@FJ$uxk%@6D$9~>u#(H5OF)-4iPx@&X?Mz)zHPkTRRPIuxda~g2RGMC zK8e()gNk9kv{5pCfkQ`yZf8kt=Egy0eC!SEsX{TIP`#kaxv;N(~vf2=&T0m(EmPw qWLp~CFn$pK{{6!)-S*OcGq*Cn!3~ZKRy-bCIy+5 zaM-=xq^i2i^;m=WtsM8H|C8n1CbQq#Xw7>>;_Xci!|!g!M=nTz6)ep=_r!}g`Bjfv zL|1L%B!LNng+IOgTAqYhKA+UVB-&?YDex#DP4{G%kX)B4w@CdbwmV;XQrE92+68nd NgQu&X%Q~loCIBYqRbl`D 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 7edb675069f3b54a74cf4dfa518600d0a7184fb4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 261 zcmV+g0s8)lP)B3901UBO}ED6Ya_3~g01orN+PqKlxUQ)@R1i_JzE>0W+96yi|H!lNn|Tu8)o|1 z&P@NTIFE4rxj7AO=N7?|3vCUvdaU{O?$NVwsVO{p@aD@3z?4t7CQ!03gk3`zSNJdq ztP3*$>b3w(3pL0&EL)gLZ^X05VrPmi4!EHT9{u z?_E*VQ79WQ;!al$Z0IUfBn)c_dya%_WodF}LO50Oi_D2*nSb&FB$qu_tZB1&00000 LNkvXXu0mjf2bgML 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 96021dc5081e1daa4d37cd649d720e676c27ecec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|mygXeTLn;`PB|Hu|_bh7Xxz{54 zm;KOGo<}SqjSsEcQucH`D6ntV%5&xTF?V5CgTe~DWM4f3@S8s 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 f0d4e97577508554557c9073d1607218a48a9215..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|m=6Sj}hEy$!Cb2S zz#@wSU0t@Pto$0DvY0ANJfO+Jc_%@IDc0TTlGYW4ge=dxOQv65K9}b?`&LHRx8cR% ztCu6g?)Y}Lt=ngk@Z`Zl(KEKD3~YMen&xf}*ET;G_$_N8$FwfNh9@fAYVY{i6n=)3 zDh2b4Yjdk#-9FRh%B|g+o6h-co%%=f<|?zlxr?K|Z{I4PY&&VA`EOR~T>aDCXT#Nj PE@kj^^>bP0l+XkKwR2O_ 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 327fd8d8af74d4c8d43a73b5a2d9f5fe5e930101..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|m+&x_!Ln;`PC9XJ3Zj@}jf8YVb zvWqPJ#u~~W|1-N9h%&a?8>VN@ zdUhXI-v9mo!`&YJ|9`*1_u~Km^Z%<0hOsbZ|Kk=6`||()<^SuBXcR5HvFrSQVNT0G i5)Ty=)C|}K85lU`W}d0$oPPpnFoUP7pUXO@geCwHelqO< 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 34c528d3cf9e84a0679632a39a8e9236f456e624..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|mygXeTLn;`PC9WK3T*%mZ{?LNX zg={OH*bDj3d}tBCvVM_D+j$2$IoCrx*^O)d{}9<}WW##th}NPDRuUd9)^iF31o(W? e5)$~57#KRQX$kL`^k4oXYh3Ob6Mw<&;$VR?=W@% diff --git a/src/recources/icons/menu_icon_black.png b/src/recources/icons/menu_icon_black.png deleted file mode 100644 index 19711de08f1d419001417529e33550c3d8eacb89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14700 zcmeI3e~c4F6vsz{Mo-}{6A)3>MGXYo-EP~XUD^_C58K3^=iL$R5+m&GPVd(1?v~v> z+B-=^B?iQZo<~B!KNK`38ZTnvA3}nOLBwD29}S5lCI%8C8c8t0pouuU?X|DHmI1?` zv)3Q*X1?#ena{kL?mxS`ulLb~T}!(VLJM=*Oh5U)&wJl?EBRb2&K@FPx0kZR4nm7g zc<-C`tzL8wLa~+l;E+3%e@s>_BdBQB2o6?^5>X?RSXU`2>Ns|}5j?7!N&dpIPkBz) zlKiGU?UR-6wnsAdm?`J?v9Dcn&k8K+-=8e7;RHKZqGJ?poX-qr!zQN!a_fG ztO;AiJ=@4sRBuBg#i~*FbF~|p=6FGghnG! z*6T`6TSdzz!@{X>LTJ|vy!={|bEe}eriyc!6lnH_6x+exo=fs`o34J0)lVtU$KSiMqI&09O7*q` z))GQfYhze-&zhV5e;2SCAGmkUQ69tQ)izW$l&|U>#IXu)S+Vi@QBo7vw%e<5n;lyd zBn0mlpr|)5MYXkgh30B@{)#5NgH0yYKt`tcs}M>E^V%AjtNI~tRf`k8KHe>oO9*+N zHCNc(>NU^+VI?H>TXJ^Wou~$Uf$_jJs1YajRH<}N2B3rLTGJn_2|Tz9wHYodA}C8Ps5ZkzMFa&57oQ4v7_!v$$jZH9}A2nrZ3NP}uKTvS9* zz;HntRGZj3(}z43>Os<6fj(n2GwS`sED9|;es@%Hp4|l1O*Hiq(QZ>imR*f z_#ZaOGk<0BaNkr~+C?4=y{`=%%_3*mW=a)Tm z;VoZL~kBA Vaq#u&;0&1w%JuYSW*^z|{C_2{|C9g# diff --git a/src/recources/icons/menu_icon_white.png b/src/recources/icons/menu_icon_white.png deleted file mode 100644 index 11adfa7989ee327eb0a6b1cbcedff0729ef2a030..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15139 zcmeI3U2NM_6vsWJO;E9E<7EXO|5<(zeKp;Q}Cd34c@xaH%9w^uObZ?TY0zkB@N+9a_cZ*v!5$iODQeX_ z{(ISp&8yZ?RQy{bJL-*Q?vgdD7*cgB2SSyi4QEr7vaMpP+9dGk92hsu1oQJNZ!ol> zCzySa44<(Fz=Sb0>ww*}yRzEsq!!niZOI;`BEtYh;Hh+_STJ3=l3=QFWq9lla|~Ub z;!P%)em@~Sni-}CECMYAt4eMW8p2d$O}=94|77C6(kw{hk3gGVv;@Z zNOAPMJd)Z`PY108GvRr*%yH#%IaHQHmNO3J@i@neoG7wz2J6n4o?2l|cS9{mBTfpq znq%0WVVSfaSIt=^FTpT=qUNi9T}8W@$aL%MAVsdC+ME#LxlSToYijJ0Q>dPru5q9M zioo<-s1rKs>6^&e(t(0j^bY zG%z>~FJ(igtM`n2YjGAu@;zP89aM}iGT&2^RZF3^LJGWAdB6dxXE|BRDkN)FHrzl+ z4-EKK6$wS?P5TT}x5{p>!l9zpinro{lu|ha2MC3>e7IrX3U?v&^c95=m>XM=a=LX{Fnw+}v##U;t6(|sv_Mi)xK6_XRkhaSwCQ@PseyDV2?s)kq04$siu!*nFG+b;&xK=b zOq3$50FNY~hXLOgu0qUYg7UV|DN8H){ZbFD!_a-&26l?OZl2=@5-v??`KKPZwa6)+@jIeX*HE~nbE$0OQT$iACPy? zQJw%MuAyq7spRvpkk4r^j*-Cm2kScoQ2IR6)*VEhM5;i}XBZXuS|N&jpi zI_^sU=R&k9S({MJaiAx;MiDm#mbP}a6tm zQbggx!;rR3sKjf&jsr1Q(tU;w88cAb6AD!t+7A1Q!AXZxUR1K8Tm#LV(~+ zf(y?F@e*7J5WGon;rSq5f(rqHHwi90AH+*=AwcjZ!G-68cnK~92;L;P@O%(2!G!?9 zn*cK-4^~VDI z{+^;rJVpJmpQ7ZG6t&hmcK^FO;M_CmRDZVe`Nb12^}NlmKD@AE-D>ZrbvC>&8%K?%3XWs7VU$XZ}yyy9i^s^Y*m(hc3`IP;%m?TUi$FL ztFedatFLcM_udv)=B`|Lf7PY4b4QQgdebM*&6@`fpB_E+==?pC4?NO$_KxR!#W$zU n&%ZbM*r&{elW!gPZ9R2xs`SOqz4P!IC@MX;D>b)$|3iNPkiT}) 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 From 2c92af45c932110a1adfe643050df1fe306a7b41 Mon Sep 17 00:00:00 2001 From: Jannik Date: Mon, 5 Jun 2017 23:09:20 +0200 Subject: [PATCH 3/8] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 3e84ec3..c12c841 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ Project HomeFlix is a Kellerkinder Project, that alowes you to sort all your local saved movies in clean UI. The dev branch is **only merged** into master when a **new release** is released, so **master contains the latest released version**. Please commit all changes to [dev](https://github.com/Seil0/Project-HomeFlix/tree/dev). +**Due to some changes with the API we use(not provided by us), the query does not work at the moment!** + Librarys used in this Project: JFoenix: https://github.com/jfoenixadmin/JFoenix minimal-json: https://github.com/ralfstx/minimal-json From 70a6485a3642c9e17ba5b52d4cb4ded2ee066b0b Mon Sep 17 00:00:00 2001 From: Jannik Date: Tue, 6 Jun 2017 02:12:59 +0200 Subject: [PATCH 4/8] minor fixes *fixed [Linux] filenames with blank are not supported *fixed exception output if api response is bad --- bin/application/MainWindowController$1.class | Bin 3402 -> 3402 bytes bin/application/MainWindowController$2.class | Bin 3056 -> 3056 bytes bin/application/MainWindowController$3.class | Bin 2002 -> 2002 bytes bin/application/MainWindowController$4.class | Bin 1946 -> 1946 bytes bin/application/MainWindowController$5.class | Bin 2511 -> 2511 bytes bin/application/MainWindowController$6.class | Bin 2471 -> 2471 bytes bin/application/MainWindowController$7.class | Bin 4118 -> 4118 bytes bin/application/MainWindowController.class | Bin 35471 -> 35356 bytes bin/application/apiQuery.class | Bin 9400 -> 9437 bytes src/application/MainWindowController.java | 13 ++----------- src/application/apiQuery.java | 1 + src/resources/HomeFlix-Local_de_DE.properties | 1 - src/resources/HomeFlix-Local_en_US.properties | 3 +-- 13 files changed, 4 insertions(+), 14 deletions(-) diff --git a/bin/application/MainWindowController$1.class b/bin/application/MainWindowController$1.class index a04b9ab0615a03b09245fa773f05fd195cf431c6..bb0df82ab79215c08be529f2fbf681c6986d048e 100644 GIT binary patch delta 92 zcmV-i0HgoP8p;~5*W^l>#XM yu>vXp!U8J*#R4n<-2yHE-~ulI@&Ygc4gxU&DgrVAI|4HSJ_0lWRsuJZ#0-YX#}jY> delta 92 zcmV-i0HgoP8p;~5*v1l>#vU yu>vvx!U8h@#R4<{-2yfM-~u-Q@&Y&k4gxs=DgrtII|4faJ_0-eRsuhh#0-YyzZ4Jv diff --git a/bin/application/MainWindowController$2.class b/bin/application/MainWindowController$2.class index 9a9dbab35596432764b0e4b3c5ae84efa3550a7b..21e3cf2bbec462b9262d11c609d0303a8ab58ae4 100644 GIT binary patch delta 85 zcmew${y}_07$>90=5WqnMn@k85hh;-VB&7Kc*mtaHdd(Sf((BCZ=$P m*+BLxrf7x@Ofd{Mfb<)tI7Visct#$k1V&+|q|L9nSQ!CMgA&#N delta 85 zcmew${y}_07$;-E=5WqnM#m5a5vEWEW2SHhC#DDnZ>C5FKc*;#aHd#>Sf)6JCZ>3X m*+BLxreuZFf delta 39 ucmcb_e~EuX6&qvjCurUC{Nra}f=rXmIxreX$frjp6h?Arn4cM4Jf diff --git a/bin/application/MainWindowController$4.class b/bin/application/MainWindowController$4.class index 1d491505a93ffcb6cb6c6747edc7fe97e5edefd5..5859bec6d3b1e858e8720ad7e8bc960c27451990 100644 GIT binary patch delta 35 rcmbQmKZ}1u3>#zq#zl393CW7BBz+ delta 71 zcmV-N0J#6p6VDT{^alZjll2GtHHZKY0*L@Q0*U}U0*e4<0*wH70*?TX0+0Zc0+9fo d0+Ilv0+Rr$0+ax-0+j%?0+#^00+^E}393xD7N`IK diff --git a/bin/application/MainWindowController$6.class b/bin/application/MainWindowController$6.class index 5ebe321b7a14739f4da7df5ecf262cbde6b5247d..03e225afbc55911fe39561cb767a1f904e8ab715 100644 GIT binary patch delta 71 zcmV-N0J#6B6Q>if%m)FJlg$VFHI@Jm0+#?e0+;|i0+|420-FGL0-XSl0-gYq0-pe$ d0-yk-0-*q^0-^x00;2%50;K@E0;ZGw2&zD{7qI{U delta 71 zcmV-N0J#6B6Q>if%m)FRlg$VFHJ$(u0-pdm0-yjq0-*qA0;2$T0;K?t0;T|y0;d3; d0;m9_0;vG10;&M80;>SD0<8eM0 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 literal 35471 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 diff --git a/bin/application/apiQuery.class b/bin/application/apiQuery.class index 7e6897450aecc092aea0880f80e92160bd767d95..46bc0ca0550c9bad2b6b57447359ce1b7a20c8ba 100644 GIT binary patch delta 439 zcmYMv-z!6L7{~F?vtvB_k*v|AbYx3SBl*=@DRH5d7NynNjkrM}yP=3CO~#E*Zk7wT zes1h+nVM`_R(|9kaP8hD7d+H*_x_&m>w9{hYyX=+HR~{y;XpmWd+CUyRMUFov$pH- z=;Y2)hw`5}+9Bj9u0Zpt$#%A|n?01km{h+!_i~U!l;CNO@|Jv8&Y zIxEPq1v#$64L2aqO}J$h1$LpxZrpPxO7g2Ld&LZh84@!hW>n0$n4p-jm`ObFw3rz& z^I{@mmc^`ziHeDd*+m&W06x(8yW0YK(I-bqIz}DnuTG>4FmRks=}aaz@;05*1**WZ zLsD*yuyB-8Qq`#Cb-I+QfsI$`3R7Uz^9rR&hY8KRNEx{`!^;!eeru>}nC_?mtE^@G xE4vI|saU0`C_{Zh{l`p&C)n`}6)$k%Rhx4KegFY=Wf1@X delta 414 zcmXxfy-Px26vy%3xpuury}gLS&7q8Rh+YURQKThsaS@>NH|3C!GGy-I5JxD-QBLu)+*=R;6f3gDz|bybK2XwHsA!+4YTu}7zo;|NU=>Za z Date: Tue, 6 Jun 2017 16:52:52 +0200 Subject: [PATCH 5/8] minor fixes * fixed some issues with the DBController * added an api key as workaround for no (rework of apiQuery is still planed) --- bin/application/DBController.class | Bin 20430 -> 20562 bytes bin/application/apiQuery.class | Bin 9437 -> 9568 bytes src/application/DBController.java | 117 ++++++++++++++++------------- src/application/apiQuery.java | 7 +- 4 files changed, 69 insertions(+), 55 deletions(-) diff --git a/bin/application/DBController.class b/bin/application/DBController.class index b5624fc54b82416f70b4b83f99d0ba4ce5930d7b..fe33f4a2049adc4ede0337fb8327242e6ea6c5a7 100644 GIT binary patch literal 20562 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 XTCW@bYGA=9aD2Gm@B&aO_2T~kt6A-c literal 20430 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 ZUId>EV#B}KhXZu{=8Dxz=u)Yl{13P9%1;0Q diff --git a/bin/application/apiQuery.class b/bin/application/apiQuery.class index 46bc0ca0550c9bad2b6b57447359ce1b7a20c8ba..83ad53e6759326a781e2b30ca9493b802ed0077f 100644 GIT binary patch literal 9568 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 I;gH|`FXp)xF8}}l diff --git a/src/application/DBController.java b/src/application/DBController.java index 9306c0b..91ebfab 100644 --- a/src/application/DBController.java +++ b/src/application/DBController.java @@ -115,16 +115,20 @@ public class DBController { ea.printStackTrace(); } + //getting all files from the selected directory TODO rework String[] entries = new File(mainWindowController.getPath()).list(); - if(mainWindowController.getPath().equals("") || mainWindowController.getPath() == null){ + if(mainWindowController.getPath().equals("") || mainWindowController.getPath() == null){ System.out.println("Kein Pfad angegeben"); //if path == null or "" - }else{ + }else if(new File(mainWindowController.getPath()).exists()) { System.out.println(entries.length); for(int i=0;i!=entries.length;i++){ filmsDir.add(cutOffEnd(entries[i])); } + } else { + System.out.println(mainWindowController.getPath() + "dosen't exist!"); } - + + //getting all entries from the streaming lists for(int v=0; v< mainWindowController.streamingData.size(); v++){ String fileName = mainWindowController.getStreamingPath()+"/"+mainWindowController.streamingData.get(v).getStreamUrl(); try { @@ -138,7 +142,9 @@ public class DBController { } catch (IOException e) { e.printStackTrace(); } - } + } + + //add all entries to filmsAll and filmsdbAl, for later comparing filmsAll.addAll(filmsDir); filmsAll.addAll(filmsStream); filmsdbAll.addAll(filmsdbLocal); @@ -146,6 +152,11 @@ public class DBController { System.out.println("films in directory: "+filmsAll.size()); System.out.println("filme in db: "+filmsdbAll.size()); + /** + * if filmsdbAll.size() == 0 database is empty, we need to fill it + * else check if there is something to remove or to add + * TODO separate local and streaming for better error handling + */ if(filmsdbAll.size() == 0){ System.out.println("creating entries ..."); @@ -155,7 +166,7 @@ public class DBController { if(mainWindowController.getPath().equals("") || mainWindowController.getPath() == null){ System.out.println("Kein Pfad angegeben"); //if path == null or "" - }else{ + }else if(new File(mainWindowController.getPath()).exists()){ for(int j=0;j!=entries.length;j++) //goes through all the files in the directory { ps.setInt(1, 0); //rating as integer 1. column @@ -198,12 +209,10 @@ public class DBController { ps.close(); psS.close(); }catch (SQLException ea) { - System.err.println("Konnte nicht ausgef�hrt werden"); + System.err.println("Ups! an error occured!"); ea.printStackTrace(); } }else { - - try { try { checkAddEntry(); //check if added a new file @@ -271,7 +280,7 @@ public class DBController { try { stmt = connection.createStatement(); - ResultSet rs = stmt.executeQuery("SELECT * FROM film_local WHERE titel = '"+name+"';" ); + ResultSet rs = stmt.executeQuery("SELECT * FROM film_local WHERE titel = \""+name+"\";" ); if(rs.getString(4).equals("favorite_black")){ mainWindowController.localFilms.set(i, new tableData(1, 1, 1, rs.getDouble(1), "1", rs.getString(2), rs.getString(3), new ImageView(favorite_black),rs.getBoolean(5))); }else{ @@ -282,7 +291,7 @@ public class DBController { } catch (SQLException e) { try { stmt = connection.createStatement(); - ResultSet rs = stmt.executeQuery("SELECT * FROM film_streaming WHERE titel = '"+name+"';" ); + ResultSet rs = stmt.executeQuery("SELECT * FROM film_streaming WHERE titel = \""+name+"\";" ); if(rs.getString(8).equals("favorite_black")){ mainWindowController.streamingFilms.set(i,new tableData(rs.getInt(1), rs.getInt(2), rs.getInt(3), rs.getDouble(4), rs.getString(5), rs.getString(6), rs.getString(7), new ImageView(favorite_black),rs.getBoolean(9))); }else{ @@ -305,25 +314,30 @@ public class DBController { Statement stmt = connection.createStatement(); for(int a=0; a nameText = new ArrayList(); ArrayList responseText = new ArrayList(); String fontFamily = main.getFONT_FAMILY(); diff --git a/src/application/apiQuery.java b/src/application/apiQuery.java index 8ce7105..545ca89 100644 --- a/src/application/apiQuery.java +++ b/src/application/apiQuery.java @@ -38,7 +38,8 @@ public class apiQuery{ private Image im; private String[] responseString = new String[20]; private String posterCache; - private String apiURL = "https://www.omdbapi.com/?"; + private String apiURL = "https://www.omdbapi.com/?apikey="; + private String apiKey = "b9f9fd23"; ArrayList responseText = new ArrayList(); ArrayList nameText = new ArrayList(); @@ -75,7 +76,7 @@ public class apiQuery{ moviename = moviename.replace(" ", "+"); //queryURL is apiURL and additional parameters, response-types: http,json,xml (must be json, since the response is processed with minimal-json ) - queryURL = new URL(apiURL + "t=" + moviename + "&plot=full&r=json"); + queryURL = new URL(apiURL + apiKey + "&t=" + moviename + "&plot=full&r=json"); is = queryURL.openStream(); br = new BufferedReader(new InputStreamReader(is, "UTF-8")); @@ -133,7 +134,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")){ + if(retdata.contains("\"Response\":\"False\"")){ //TODO + FIXME mainWindowController.textFlow.getChildren().add(new Text(mainWindowController.noFilmFound)); im = new Image("resources/icons/close_black_2048x2048.png"); mainWindowController.image1.setImage(im); From 59bfe126c58161ebcec4e5649f8a8e9706d28ed6 Mon Sep 17 00:00:00 2001 From: Seil0 Date: Wed, 7 Jun 2017 01:42:18 +0200 Subject: [PATCH 6/8] Settings-UI clean up * cleand up the settings ui #15 * the menu button si now a hamburger menu --- bin/application/Main.class | Bin 7044 -> 7161 bytes bin/application/MainWindow.fxml | 37 ++++-- bin/application/MainWindowController$1.class | Bin 3402 -> 3402 bytes bin/application/MainWindowController$2.class | Bin 3056 -> 3056 bytes bin/application/MainWindowController$3.class | Bin 2002 -> 2002 bytes bin/application/MainWindowController$4.class | Bin 1946 -> 1946 bytes bin/application/MainWindowController$5.class | Bin 2511 -> 2511 bytes bin/application/MainWindowController$6.class | Bin 2471 -> 2471 bytes bin/application/MainWindowController$7.class | Bin 4118 -> 4118 bytes bin/application/MainWindowController.class | Bin 35356 -> 36406 bytes bin/application/application.css | 1 - src/application/Main.java | 2 +- src/application/MainWindow.css | 4 + src/application/MainWindow.fxml | 37 ++++-- src/application/MainWindowController.java | 105 ++++++++++-------- src/application/application.css | 1 - src/resources/HomeFlix-Local_de_DE.properties | 22 +++- src/resources/HomeFlix-Local_en_US.properties | 22 +++- 18 files changed, 150 insertions(+), 81 deletions(-) delete mode 100644 bin/application/application.css create mode 100644 src/application/MainWindow.css delete mode 100644 src/application/application.css diff --git a/bin/application/Main.class b/bin/application/Main.class index a2798b7280e2397b2db22ab47cb7606c9d76378b..7ea09ff47580c23e025b2b11f28662f947ac6b08 100644 GIT binary patch delta 1161 zcmY*XNmN`#6utNN@PGFydSE!v7y=55FbEze6g38c5FikRAYum6rhk~bWA{&Jj1e_~ z7~@*_?tSlg<@HMU@;{fa z0=SdkPrJ_vllO45;DeYVJl&?%W(^ORu^!X3Vg{?#TXV2C+|e5jMTW}v$6{{Quuf+! zA^L)cgB4-Zs%UTBF1Qtqs@RIu#Vs=$4i0RMLy_Da7e%ht~US?t;13iF`O2$3VFJUI@*CmEIfp0<2T zARQSl_VBRa5C;fneO+sFb&JknB3G{Zvt*awVYqmNM|D0eS3SkHXE-8Dy;Vk>&k1bc z^K#Hz?u_G%!BIKo&FTyDgy0Lfi*T*k8SM>syBX(;f~T;VNQ;@)HZvG9qdU#GW$7~4ye zY?%fXu|O+C2sZ3dOSg>MWnT8|$T7{2<5~ctS^>tiBAn1R;UxB^))J0XGjw5}LSD_! zN7$eC~S&nX9phx*{Nzb!udC@={Tfgtl}?B_*XFs>WZt5kR2L+ zMx#O-0ojz3#>Zu6P9gWmqdEB_!6bf|Kw$#6m1c1N8gM31Sdu|=hTV%CoM$Y7f^~f8 zKkWNoeu?qU89ueZXPe8?$CEr(Rx-y}29GB>mgLDB=%qFEN?DSxw0@vI!z6uoDY%|6)X*-qOOTBMF++Dc^p(P-9E|uAygR01tJvUO z($a_R3gRIDuEd^1_$#OR`mKJE*nE)%-5`1*lW;Y z>=QrwmZvN_uHsq#uj?9PMUCssMAFO_8$V~@d0Gk5`b|4#XVX@{4ht_Bc#&3tN^<56 z?q+kJt>R@+;AWMUjAfgaUA!=2U{u8YW!(7{0|)V{*zb?5IE*6-USrWWHFpl$>5P?N zJ+IRUyUJ}fya}P;El`c<4c4&!xABhn(_fFH;kzA}vaoWzvhk3MN9oHzw6|Bbw zk}%I-HzGsI4+jIow>p>QXj&j4*f7ewRyUeLCx zGOV6y49;RtdqeP;gQwXQq(gYdL3F=^12^DH4j2tLI2h|-%MMNBjY+D#jPagXyxZ)q zbT4>#tXZzBlpXqg1}E~QbEgmZ#1&77FDvb)5AhL6^cCHMkMRk6`wNxg6ef8lzmbMK zm6MFqEY4u}7FcJ%-Ru?Ft| diff --git a/bin/application/MainWindow.fxml b/bin/application/MainWindow.fxml index 12ceeba..032c390 100644 --- a/bin/application/MainWindow.fxml +++ b/bin/application/MainWindow.fxml @@ -2,9 +2,11 @@ + + @@ -46,10 +48,14 @@ - + + + + + - + @@ -86,16 +92,23 @@ - - - - diff --git a/bin/application/MainWindowController$1.class b/bin/application/MainWindowController$1.class index bb0df82ab79215c08be529f2fbf681c6986d048e..83f39ab48e238eb32e265592d37b4ecdde2d51f3 100644 GIT binary patch delta 92 zcmV-i0HgoP8p;~5)*!l>!+6 yu>u+Z!U7ur#R41v-2xr}-~t~2@&X_M4gw(oDgq(_I|3sCJ^~~GRstuJ#0-X$*Ag%Q delta 92 zcmV-i0HgoP8p;~5*W^l>#XM yu>vXp!U8J*#R4n<-2yHE-~ulI@&Ygc4gxU&DgrVAI|4HSJ_0lWRsuJZ#0-YX#}jY> diff --git a/bin/application/MainWindowController$2.class b/bin/application/MainWindowController$2.class index 21e3cf2bbec462b9262d11c609d0303a8ab58ae4..05989309eab0d8625e93ea82dad2b762439a5aa7 100644 GIT binary patch delta 85 zcmew${y}_07$;-U=5WqnM#nG)5vFhkW2Q(3C#EO{Z>DGlKc*OlaHe>MSf&JqCZ90=5WqnMn@k85hh;-VB&7Kc*mtaHdd(Sf((BCZ=$P m*+BLxrf7x@Ofd{Mfb<)tI7Visct#$k1V&+|q|L9nSQ!CMgA&#N diff --git a/bin/application/MainWindowController$3.class b/bin/application/MainWindowController$3.class index 05dc50b80c2721ae7196909d4c2c0be3c7d4bbe7..d3984f0ea209c5ebee712fdfdb01e244a97ba1cb 100644 GIT binary patch delta 39 ucmcb_e~EuX6&qvz?Arn5X$oKf delta 39 ucmcb_e~EuX6&qvfFf diff --git a/bin/application/MainWindowController$4.class b/bin/application/MainWindowController$4.class index 5859bec6d3b1e858e8720ad7e8bc960c27451990..805fc8428c9736ad7f744769281c867b52607167 100644 GIT binary patch delta 35 rcmbQmKZ}1u3>#zR#zq0*?T90+9fZ0+Ile0+Rrq d0+axx0+j%&0+s-<0+#@^0+|520-BR0393+;7RCSo delta 71 zcmV-N0J#6p6VDT{^alZbll2GtHGlvQ0)YTI0)hZM0)qf%0)+r~0*3&P0*C;U0*L^g d0*U~n0*e5u0*nB#0*wH)0*?T@0+5p>393CW7BBz+ diff --git a/bin/application/MainWindowController$6.class b/bin/application/MainWindowController$6.class index 03e225afbc55911fe39561cb767a1f904e8ab715..e7f5c3dd0dc5b7152625d50b53449ea4c7f9a224 100644 GIT binary patch delta 71 zcmV-N0J#6B6Q>if%m)FTlg$VFHJ|_w0-*po0-^vs0;2$C0;K?V0;d3v0;m9!0;vF= d0;&L{0;>S30;~YA0<8eF0if%m)FJlg$VFHI@Jm0+#?e0+;|i0+|420-FGL0-XSl0-gYq0-pe$ d0-yk-0-*q^0-^x00;2%50;K@E0;ZGw2&zD{7qI{U diff --git a/bin/application/MainWindowController$7.class b/bin/application/MainWindowController$7.class index 770d9bc0379158cdea085ac68c6682629f9a086d..b5e693611216b99421f085a3520fe8c2ce4546b1 100644 GIT binary patch delta 158 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 literal 35356 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 diff --git a/bin/application/application.css b/bin/application/application.css deleted file mode 100644 index 83d6f33..0000000 --- a/bin/application/application.css +++ /dev/null @@ -1 +0,0 @@ -/* JavaFX CSS - Leave this comment until you have at least create one rule which uses -fx-Property */ \ No newline at end of file diff --git a/src/application/Main.java b/src/application/Main.java index b853e3a..b40c599 100644 --- a/src/application/Main.java +++ b/src/application/Main.java @@ -128,7 +128,7 @@ public class Main extends Application { mainWindowController.addDataUI(); Scene scene = new Scene(pane); //create new scene, append pane to scene - + scene.getStylesheets().add(Main.class.getResource("MainWindow.css").toExternalForm()); primaryStage.setScene(scene); //append scene to stage primaryStage.show(); //show stage } catch (IOException e) { diff --git a/src/application/MainWindow.css b/src/application/MainWindow.css new file mode 100644 index 0000000..cb1165b --- /dev/null +++ b/src/application/MainWindow.css @@ -0,0 +1,4 @@ +.jfx-hamburgerW StackPane { -fx-background-color: white; + -fx-background-radius: 5px; } +.jfx-hamburgerB StackPane { -fx-background-color: black; + -fx-background-radius: 5px; } \ No newline at end of file diff --git a/src/application/MainWindow.fxml b/src/application/MainWindow.fxml index 12ceeba..032c390 100644 --- a/src/application/MainWindow.fxml +++ b/src/application/MainWindow.fxml @@ -2,9 +2,11 @@ + + @@ -46,10 +48,14 @@ - + + + + + - + @@ -86,16 +92,23 @@ - - - - diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index 7004377..37b237e 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -42,9 +42,11 @@ import java.util.Properties; import java.util.ResourceBundle; import com.jfoenix.controls.JFXButton; import com.jfoenix.controls.JFXColorPicker; +import com.jfoenix.controls.JFXHamburger; import com.jfoenix.controls.JFXSlider; import com.jfoenix.controls.JFXTextField; import com.jfoenix.controls.JFXToggleButton; +import com.jfoenix.transitions.hamburger.HamburgerBackArrowBasicTransition; import javafx.animation.FadeTransition; import javafx.animation.ParallelTransition; @@ -72,6 +74,7 @@ import javafx.scene.control.TreeTableColumn.SortType; import javafx.scene.control.TreeTableView; import javafx.scene.image.Image; import javafx.scene.image.ImageView; +import javafx.scene.input.MouseEvent; import javafx.scene.layout.AnchorPane; import javafx.scene.layout.GridPane; import javafx.scene.layout.HBox; @@ -103,8 +106,6 @@ public class MainWindowController { @FXML ScrollPane scrollPane; @FXML - private JFXButton menubtn; //TODO switch to hamburger menu - @FXML private JFXButton playbtn; @FXML private JFXButton openfolderbtn; @@ -129,6 +130,8 @@ public class MainWindowController { @FXML private JFXButton streamingDirectoryBtn; @FXML + private JFXHamburger menuHam; + @FXML private JFXToggleButton autoupdateBtn; @FXML public JFXTextField tfPath; @@ -143,13 +146,20 @@ public class MainWindowController { @FXML public JFXSlider sliderFontSize; @FXML - private Label versionlbl; + private Label versionLabel; @FXML - private Label sizelbl; + private Label fontsizeLabel; @FXML - private Label aulbl; + private Label autoUpdateLabel; + @FXML + private Label settingsHead1Label; + @FXML + private Label mainColorLabel; + @FXML + private Label localLabel; @FXML ImageView image1; + private ImageView imv1; @FXML @@ -176,14 +186,14 @@ public class MainWindowController { @FXML private TableColumn dataNameEndColumn = new TableColumn<>("Datei Name mit Endung"); - private boolean menutrue = false; //saves the position of menuBtn (opened or closed) - private boolean settingstrue = false; + private boolean menuTrue = false; //saves the position of menuBtn (opened or closed) + private boolean settingsTrue = false; private boolean streamingSettingsTrue = false; private boolean autoUpdate = false; static boolean firststart = false; private int hashA = -2055934614; private String version = "0.5.1"; - private String buildNumber = "127"; + private String buildNumber = "129"; private String versionName = "plasma cow"; private File dirWin = new File(System.getProperty("user.home") + "/Documents/HomeFlix"); private File dirLinux = new File(System.getProperty("user.home") + "/HomeFlix"); @@ -239,8 +249,6 @@ public class MainWindowController { ObservableList localFilms = FXCollections.observableArrayList(); ObservableList streamingFilms = FXCollections.observableArrayList(); ObservableList streamingData = FXCollections.observableArrayList(); - 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")); @@ -258,30 +266,6 @@ public class MainWindowController { private apiQuery ApiQuery; DBController dbController; - /** - * TODO change value of Text-color change - */ - @FXML - private void menubtnclicked(){ - if(menutrue == false){ - sideMenuSlideIn(); - menutrue = true; - }else{ - sideMenuSlideOut(); - menutrue = false; - } - if(settingstrue == true){ - settingsAnchor.setVisible(false); - setPath(tfPath.getText()); - saveSettings(); - settingstrue = false; - } - if(streamingSettingsTrue == true){ - streamingSettingsAnchor.setVisible(false); - streamingSettingsTrue = false; - } - } - @FXML private void playbtnclicked(){ System.out.println(System.getProperty("os.name")); @@ -367,18 +351,18 @@ public class MainWindowController { @FXML private void settingsBtnclicked(){ - if(settingstrue == false){ + if(settingsTrue == false){ if(streamingSettingsTrue == true){ streamingSettingsAnchor.setVisible(false); streamingSettingsTrue = false; } settingsAnchor.setVisible(true); - settingstrue = true; + settingsTrue = true; }else{ settingsAnchor.setVisible(false); setPath(tfPath.getText()); saveSettings(); - settingstrue = false; + settingsTrue = false; } } @@ -388,9 +372,9 @@ public class MainWindowController { @FXML private void streamingSettingsBtnclicked(){ if(streamingSettingsTrue == false){ - if(settingstrue == true){ + if(settingsTrue == true){ settingsAnchor.setVisible(false); - settingstrue = false; + settingsTrue = false; } streamingSettingsAnchor.setVisible(true); streamingSettingsTrue = true; @@ -415,8 +399,8 @@ public class MainWindowController { settingsAnchor.setVisible(false); streamingSettingsAnchor.setVisible(false); sideMenuSlideOut(); //disables side-menu - menutrue = false; - settingstrue = false; + menuTrue = false; + settingsTrue = false; streamingSettingsTrue = false; } @@ -581,6 +565,32 @@ public class MainWindowController { //Initializing the actions void initActions(){ + HamburgerBackArrowBasicTransition burgerTask = new HamburgerBackArrowBasicTransition(menuHam); + menuHam.addEventHandler(MouseEvent.MOUSE_PRESSED, (e)->{ + if(menuTrue == false){ + sideMenuSlideIn(); + burgerTask.setRate(1.0); + burgerTask.play(); + menuTrue = true; + }else{ + sideMenuSlideOut(); + burgerTask.setRate(-1.0); + burgerTask.play(); + menuTrue = false; + } + if(settingsTrue == true){ + settingsAnchor.setVisible(false); + setPath(tfPath.getText()); + saveSettings(); + settingsTrue = false; + } + if(streamingSettingsTrue == true){ + streamingSettingsAnchor.setVisible(false); + streamingSettingsTrue = false; + } + + }); + tfsearch.textProperty().addListener(new ChangeListener() { @Override public void changed(ObservableValue observable,String oldValue, String newValue) { @@ -850,7 +860,7 @@ public class MainWindowController { playbtn.setGraphic(play_arrow_white); returnBtn.setGraphic(skip_previous_white); forwardBtn.setGraphic(skip_next_white); - menubtn.setGraphic(menu_icon_white); + menuHam.getStyleClass().add("jfx-hamburgerW"); }else{ settingsBtn.setStyle("-fx-text-fill: BLACK;"); streamingSettingsBtn.setStyle("-fx-text-fill: BLACK;"); @@ -867,7 +877,7 @@ public class MainWindowController { playbtn.setGraphic(play_arrow_black); returnBtn.setGraphic(skip_previous_black); forwardBtn.setGraphic(skip_next_black); - menubtn.setGraphic(menu_icon_black); + menuHam.getStyleClass().add("jfx-hamburgerB"); } if(mode.equals("local")){ @@ -934,9 +944,12 @@ public class MainWindowController { updateBtn.setText(bundle.getString("checkUpdates")); directoryBtn.setText(bundle.getString("chooseFolder")); streamingDirectoryBtn.setText(bundle.getString("chooseFolder")); - sizelbl.setText(bundle.getString("fontSize")); - aulbl.setText(bundle.getString("autoUpdate")); - versionlbl.setText(bundle.getString("version")+" "+version+" (Build: "+buildNumber+")"); + settingsHead1Label.setText(bundle.getString("settingsHead1Label")); + mainColorLabel.setText(bundle.getString("mainColorLabel")); + fontsizeLabel.setText(bundle.getString("fontsizeLabel")); + localLabel.setText(bundle.getString("localLabel")); + autoUpdateLabel.setText(bundle.getString("autoUpdateLabel")); + versionLabel.setText(bundle.getString("version")+" "+version+" (Build: "+buildNumber+")"); columnTitel.setText(bundle.getString("columnName")); columnRating.setText(bundle.getString("columnRating")); columnStreamUrl.setText(bundle.getString("columnStreamUrl")); diff --git a/src/application/application.css b/src/application/application.css deleted file mode 100644 index 83d6f33..0000000 --- a/src/application/application.css +++ /dev/null @@ -1 +0,0 @@ -/* JavaFX CSS - Leave this comment until you have at least create one rule which uses -fx-Property */ \ No newline at end of file diff --git a/src/resources/HomeFlix-Local_de_DE.properties b/src/resources/HomeFlix-Local_de_DE.properties index 24bfba5..aa9c214 100644 --- a/src/resources/HomeFlix-Local_de_DE.properties +++ b/src/resources/HomeFlix-Local_de_DE.properties @@ -1,24 +1,35 @@ -# HomeFlix-Local_de_DE.properties German Local +#HomeFlix-Local_de_DE.properties German Local + +#main window translations info = Info settings = Einstellungen streamingSettings = Stream Einst. -tfPath = Pfad... tfSearch = Suche... openFolder = Ordner \u00F6ffnen + +#settings translations +settingsHead1Label = HomeFlix Einstellungen +tfPath = Pfad... chooseFolder = Ordner ausw\u00E4hlen -fontSize = Schriftgr\u00F6\u00DFe: +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 -autoUpdate = beim Start nach Updates suchen: +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 @@ -29,6 +40,8 @@ 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 @@ -45,5 +58,6 @@ 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/resources/HomeFlix-Local_en_US.properties b/src/resources/HomeFlix-Local_en_US.properties index 379c88f..d166f04 100644 --- a/src/resources/HomeFlix-Local_en_US.properties +++ b/src/resources/HomeFlix-Local_en_US.properties @@ -1,24 +1,35 @@ -# HomeFlix-Local_en_US.properties US-English Local and default +#HomeFlix-Local_en_US.properties US-English Local and default + +#main window translations info = Info settings = Settings streamingSettings = Stream Settings -tfPath = Path... tfSearch = Search... openFolder = open Folder + +#settings translations +settingsHead1Label = HomeFlix Settings +tfPath = Path... chooseFolder = choose Directory -fontSize = font size: +mainColorLabel = main color: +fontsizeLabel = font size: +localLabel = local: checkUpdates = check for updates checkingUpdates = checking for updates... updateBtnavail = update available updateBtnNotavail = no update available -autoUpdate = check at startup for updates: +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 @@ -29,6 +40,8 @@ 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 @@ -45,5 +58,6 @@ awards = Awards metascore = Metascore imdbRating = IMDB-Rating type = Type + firstStartHeader = There is no root directory for movies! firstStartContent = Specify a root directory? From 8283620620452ef48808a0251781427a97050ab7 Mon Sep 17 00:00:00 2001 From: Seil0 Date: Wed, 7 Jun 2017 01:45:09 +0200 Subject: [PATCH 7/8] removed some not needed icons --- src/resources/icons/menu_icon_black.png | Bin 14700 -> 0 bytes src/resources/icons/menu_icon_white.png | Bin 15139 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/resources/icons/menu_icon_black.png delete mode 100644 src/resources/icons/menu_icon_white.png diff --git a/src/resources/icons/menu_icon_black.png b/src/resources/icons/menu_icon_black.png deleted file mode 100644 index 19711de08f1d419001417529e33550c3d8eacb89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14700 zcmeI3e~c4F6vsz{Mo-}{6A)3>MGXYo-EP~XUD^_C58K3^=iL$R5+m&GPVd(1?v~v> z+B-=^B?iQZo<~B!KNK`38ZTnvA3}nOLBwD29}S5lCI%8C8c8t0pouuU?X|DHmI1?` zv)3Q*X1?#ena{kL?mxS`ulLb~T}!(VLJM=*Oh5U)&wJl?EBRb2&K@FPx0kZR4nm7g zc<-C`tzL8wLa~+l;E+3%e@s>_BdBQB2o6?^5>X?RSXU`2>Ns|}5j?7!N&dpIPkBz) zlKiGU?UR-6wnsAdm?`J?v9Dcn&k8K+-=8e7;RHKZqGJ?poX-qr!zQN!a_fG ztO;AiJ=@4sRBuBg#i~*FbF~|p=6FGghnG! z*6T`6TSdzz!@{X>LTJ|vy!={|bEe}eriyc!6lnH_6x+exo=fs`o34J0)lVtU$KSiMqI&09O7*q` z))GQfYhze-&zhV5e;2SCAGmkUQ69tQ)izW$l&|U>#IXu)S+Vi@QBo7vw%e<5n;lyd zBn0mlpr|)5MYXkgh30B@{)#5NgH0yYKt`tcs}M>E^V%AjtNI~tRf`k8KHe>oO9*+N zHCNc(>NU^+VI?H>TXJ^Wou~$Uf$_jJs1YajRH<}N2B3rLTGJn_2|Tz9wHYodA}C8Ps5ZkzMFa&57oQ4v7_!v$$jZH9}A2nrZ3NP}uKTvS9* zz;HntRGZj3(}z43>Os<6fj(n2GwS`sED9|;es@%Hp4|l1O*Hiq(QZ>imR*f z_#ZaOGk<0BaNkr~+C?4=y{`=%%_3*mW=a)Tm z;VoZL~kBA Vaq#u&;0&1w%JuYSW*^z|{C_2{|C9g# diff --git a/src/resources/icons/menu_icon_white.png b/src/resources/icons/menu_icon_white.png deleted file mode 100644 index 11adfa7989ee327eb0a6b1cbcedff0729ef2a030..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15139 zcmeI3U2NM_6vsWJO;E9E<7EXO|5<(zeKp;Q}Cd34c@xaH%9w^uObZ?TY0zkB@N+9a_cZ*v!5$iODQeX_ z{(ISp&8yZ?RQy{bJL-*Q?vgdD7*cgB2SSyi4QEr7vaMpP+9dGk92hsu1oQJNZ!ol> zCzySa44<(Fz=Sb0>ww*}yRzEsq!!niZOI;`BEtYh;Hh+_STJ3=l3=QFWq9lla|~Ub z;!P%)em@~Sni-}CECMYAt4eMW8p2d$O}=94|77C6(kw{hk3gGVv;@Z zNOAPMJd)Z`PY108GvRr*%yH#%IaHQHmNO3J@i@neoG7wz2J6n4o?2l|cS9{mBTfpq znq%0WVVSfaSIt=^FTpT=qUNi9T}8W@$aL%MAVsdC+ME#LxlSToYijJ0Q>dPru5q9M zioo<-s1rKs>6^&e(t(0j^bY zG%z>~FJ(igtM`n2YjGAu@;zP89aM}iGT&2^RZF3^LJGWAdB6dxXE|BRDkN)FHrzl+ z4-EKK6$wS?P5TT}x5{p>!l9zpinro{lu|ha2MC3>e7IrX3U?v&^c95=m>XM=a=LX{Fnw+}v##U;t6(|sv_Mi)xK6_XRkhaSwCQ@PseyDV2?s)kq04$siu!*nFG+b;&xK=b zOq3$50FNY~hXLOgu0qUYg7UV|DN8H){ZbFD!_a-&26l?OZl2=@5-v??`KKPZwa6)+@jIeX*HE~nbE$0OQT$iACPy? zQJw%MuAyq7spRvpkk4r^j*-Cm2kScoQ2IR6)*VEhM5;i}XBZXuS|N&jpi zI_^sU=R&k9S({MJaiAx;MiDm#mbP}a6tm zQbggx!;rR3sKjf&jsr1Q(tU;w88cAb6AD!t+7A1Q!AXZxUR1K8Tm#LV(~+ zf(y?F@e*7J5WGon;rSq5f(rqHHwi90AH+*=AwcjZ!G-68cnK~92;L;P@O%(2!G!?9 zn*cK-4^~VDI z{+^;rJVpJmpQ7ZG6t&hmcK^FO;M_CmRDZVe`Nb12^}NlmKD@AE-D>ZrbvC>&8%K?%3XWs7VU$XZ}yyy9i^s^Y*m(hc3`IP;%m?TUi$FL ztFedatFLcM_udv)=B`|Lf7PY4b4QQgdebM*&6@`fpB_E+==?pC4?NO$_KxR!#W$zU n&%ZbM*r&{elW!gPZ9R2xs`SOqz4P!IC@MX;D>b)$|3iNPkiT}) From a77ed0b8e249bf2ef62b1d8cc6ae808f0dd65305 Mon Sep 17 00:00:00 2001 From: Jannik Date: Mon, 10 Jul 2017 11:27:33 +0200 Subject: [PATCH 8/8] release 129/0.5.2 "solidify cow" --- .classpath | 2 +- bin/.gitignore | 2 - bin/application/MainWindowController$7.class | Bin 4118 -> 4098 bytes bin/application/MainWindowController.class | Bin 36406 -> 36408 bytes bin/resources/HomeFlix-Local_de_DE.properties | 63 ++++++++++++++++++ bin/resources/HomeFlix-Local_en_US.properties | 63 ++++++++++++++++++ bin/resources/Homeflix_Icon_64x64.png | Bin 0 -> 24056 bytes bin/resources/Homeflix_Poster.png | Bin 0 -> 30665 bytes bin/resources/icons/close_black_2048x2048.png | Bin 0 -> 9502 bytes .../icons/ic_favorite_black_18dp_1x.png | Bin 0 -> 214 bytes .../ic_favorite_border_black_18dp_1x.png | Bin 0 -> 261 bytes .../icons/ic_play_arrow_black_18dp_1x.png | Bin 0 -> 131 bytes .../icons/ic_play_arrow_white_18dp_1x.png | Bin 0 -> 135 bytes .../icons/ic_search_black_18dp_1x.png | Bin 0 -> 215 bytes .../icons/ic_skip_next_black_18dp_1x.png | Bin 0 -> 128 bytes .../icons/ic_skip_next_white_18dp_1x.png | Bin 0 -> 134 bytes .../icons/ic_skip_previous_black_18dp_1x.png | Bin 0 -> 131 bytes .../icons/ic_skip_previous_white_18dp_1x.png | Bin 0 -> 138 bytes src/application/DBController.java | 1 - src/application/MainWindowController.java | 4 +- 20 files changed, 129 insertions(+), 6 deletions(-) create mode 100644 bin/resources/HomeFlix-Local_de_DE.properties create mode 100644 bin/resources/HomeFlix-Local_en_US.properties create mode 100644 bin/resources/Homeflix_Icon_64x64.png create mode 100644 bin/resources/Homeflix_Poster.png create mode 100644 bin/resources/icons/close_black_2048x2048.png create mode 100644 bin/resources/icons/ic_favorite_black_18dp_1x.png create mode 100644 bin/resources/icons/ic_favorite_border_black_18dp_1x.png create mode 100644 bin/resources/icons/ic_play_arrow_black_18dp_1x.png create mode 100644 bin/resources/icons/ic_play_arrow_white_18dp_1x.png create mode 100644 bin/resources/icons/ic_search_black_18dp_1x.png create mode 100644 bin/resources/icons/ic_skip_next_black_18dp_1x.png create mode 100644 bin/resources/icons/ic_skip_next_white_18dp_1x.png create mode 100644 bin/resources/icons/ic_skip_previous_black_18dp_1x.png create mode 100644 bin/resources/icons/ic_skip_previous_white_18dp_1x.png 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 b5e693611216b99421f085a3520fe8c2ce4546b1..0fed8760b5510f08befb0789eb487cffd666dc09 100644 GIT binary patch delta 32 ocmbQH(4?^87B}OT&9}L|nR!hZSQ!|Ygcv3<%wu4j?9P840HWdu%>V!Z delta 34 qcmZotn5MAd7B}OG&9}L|nYld}*clj@gcv3<%$vNNPj<2u{|NxTI|@Yr diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class index a420cad5e03c6a442b725e0ed6d919944f909867..9aca2d14f8b72ba3b52e17799079b151211136ab 100644 GIT binary patch delta 30 mcmdlshiS(grVYmh7>y>M5K!XeDbCNyOvy~E-273%wH5%ljSJua delta 28 kcmdlnhiTg!rVYmh7!4<%5Kv<0D#%GJ&Q09>S-`ax0HIzA_y7O^ 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 0000000000000000000000000000000000000000..64787d6596cf95c8c1edd64d0a66386159c7a408 GIT binary patch literal 24056 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 JLIv}H{{!&({3!qc literal 0 HcmV?d00001 diff --git a/bin/resources/Homeflix_Poster.png b/bin/resources/Homeflix_Poster.png new file mode 100644 index 0000000000000000000000000000000000000000..9f2aa98324adbcda5d666971a96114811a3b62e1 GIT binary patch literal 30665 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 n=5IaxAO0X|5#;pxJ^-dpTFx>*NT literal 0 HcmV?d00001 diff --git a/bin/resources/icons/close_black_2048x2048.png b/bin/resources/icons/close_black_2048x2048.png new file mode 100644 index 0000000000000000000000000000000000000000..2d0397b310948819f95bc522b2dcf28400d46249 GIT binary patch literal 9502 zcmeHLdu&r>6hF76>#)p%V8M;7i}Nu}MPd*}c(f44HXjpFVgYd_m?*wBQ4mD97Zeo{ zP)Uf!R|N&1P!p9HkzOPbVhnCR*aYJ0D|Vu8iDitA_Vb+cwPPK(tPEn%w11qQ^WAfP z-|w97eD~h(uAEX;o_9|EIRKDXSutrUKrX7ekZZ=j6^n{Z_&0LObvKvce=mO97Th@x z!_IqfYSm3pSbL=6+V*?IHEjiDm6OZka~DLf`U&8o6_t}F+`LfvbKiuj+sgY-uK!J& z+pn>zE%<%E>Pv3S`PHl5|JC$~AI>=PNiPUwL$VdfR=}_V?an11-=*)iwEx_E)U^I+ zblxznQdC!0yTIEZ8g8+{^M{*E+UnRg(B_IOps`WKp*F*zMr-WVE5ReK(3aGRqb7(n zna;AIyd*C#B&k~J#P>+m9YEr{ZBVD$e9nlv0{}A~IT3Ry2&;D}T6`wdek1mpXgIV< zyljDJjiO&K#@HxL?Zx;*4hRQvv}q>z1?p-I2l>UP?5f3&^yH8X^d$ll{!Xt1ByhsC zCdQNa%M#-mh9}&Dmev=TXA-t^T+T8RI$onRdV4v69k4U!6Tpq94kYI`zTEBV+2h@f zSkep*&OCXsK6M$>);*)rKvd<82<;Y$zUT6(P#LuRs z3U+a|AQ`Mzb#!T9Src*6wm8hPAZB&p_FyR{vvW4&e^xQKmDYPPP+EqnJC__3mo_xw z)J@?Dq!t>gMKoG6ksK~euTpdACXc}83UG6wq~>yQKcd8bL^jxuB(WdK`Q#zvpKXcS zTU$;8p%;^8Lr!&>{u33$=eoI%7Y;_8MaLUYc?x^W>EDB$m`2Sf2kj?vC>fSk1zS;t zPy+C9#0fTkc@HYJJ=i>=IA+yNbQ?xVJ0$>Px5UjpW#N8lyvxQuX}rzG*V1^CjlI&? z#KsrWc%6;UrLlpH&!pjJV}~?eA;YynKtC@OR?*ZB+?_ctSi4Dp7gmMcV0LKMZ&Yw; zWmo{krq5}1gG0}c+Vv+bq1Px;pCxAXeQ9c~h}tzvXk|Vn(&}Mjku*x#m@AFpY)qF% z2^*EtC}Lx@G={KonKb&dae*{)+2|_`VB^?oN~ClL%Ox9$`?*_5?)?E%aA+G3kz6;5 zokJ`S%8-vZWWEe}k3$Y}NHK>Dlp#8YY?mRtIHmW>kasv_zntZFo@FFE`$-PpEZ`m_ z#%uE>R;~bvy+t7pU;%R+S}}#_&&SPy<(81fA-Edv&Q?l!X-a3wSr7(u*(YbA1<=-A z&9nGe-YSW$=Uk@AkT*EwTbT=o43r@r4jCJ@`xGxk?H-(XM5loZ=;~tB;>w#`V8y0z zLClIfq)r9gENRu9{_l=HmNYji`wbc9oe{C zJ;HQDmg|{GxiUlc+}pW&IlzY*dN&6;&GDhC_e0UOmNNlE=PNBfM?p4TBmN0+VBv++l23{@1NRG z6MpW*V?KmBHvi?m!8sVh;=no!c-F+#M{t#X35)sD5ueu1^DMQ}pyu@IGvpwB*BYwJ zanylLa42Z0OeQwh?(+O;jxMf_qCT9m{N?94)^2SOD(B#?vgdW{*ig;I$3LDV$)O~@ijy^;(3u_umERAOaFH>!z!bSC5?c_wy zNUtQx3h9+h@FJ$uxk%@6D$9~>u#(H5OF)-4iPx@&X?Mz)zHPkTRRPIuxda~g2RGMC zK8e()gNk9kv{5pCfkQ`yZf8kt=Egy0eC!SEsX{TIP`#kaxv;N(~vf2=&T0m(EmPw qWLp~CFn$pK{{6!)-S*OcGq*Cn!3~ZKRy-bCIy+5 zaM-=xq^i2i^;m=WtsM8H|C8n1CbQq#Xw7>>;_Xci!|!g!M=nTz6)ep=_r!}g`Bjfv zL|1L%B!LNng+IOgTAqYhKA+UVB-&?YDex#DP4{G%kX)B4w@CdbwmV;XQrE92+68nd NgQu&X%Q~loCIBYqRbl`D literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7edb675069f3b54a74cf4dfa518600d0a7184fb4 GIT binary patch literal 261 zcmV+g0s8)lP)B3901UBO}ED6Ya_3~g01orN+PqKlxUQ)@R1i_JzE>0W+96yi|H!lNn|Tu8)o|1 z&P@NTIFE4rxj7AO=N7?|3vCUvdaU{O?$NVwsVO{p@aD@3z?4t7CQ!03gk3`zSNJdq ztP3*$>b3w(3pL0&EL)gLZ^X05VrPmi4!EHT9{u z?_E*VQ79WQ;!al$Z0IUfBn)c_dya%_WodF}LO50Oi_D2*nSb&FB$qu_tZB1&00000 LNkvXXu0mjf2bgML literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..96021dc5081e1daa4d37cd649d720e676c27ecec GIT binary patch literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|mygXeTLn;`PB|Hu|_bh7Xxz{54 zm;KOGo<}SqjSsEcQucH`D6ntV%5&xTF?V5CgTe~DWM4f3@S8s literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f0d4e97577508554557c9073d1607218a48a9215 GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|m=6Sj}hEy$!Cb2S zz#@wSU0t@Pto$0DvY0ANJfO+Jc_%@IDc0TTlGYW4ge=dxOQv65K9}b?`&LHRx8cR% ztCu6g?)Y}Lt=ngk@Z`Zl(KEKD3~YMen&xf}*ET;G_$_N8$FwfNh9@fAYVY{i6n=)3 zDh2b4Yjdk#-9FRh%B|g+o6h-co%%=f<|?zlxr?K|Z{I4PY&&VA`EOR~T>aDCXT#Nj PE@kj^^>bP0l+XkKwR2O_ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..327fd8d8af74d4c8d43a73b5a2d9f5fe5e930101 GIT binary patch literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|m+&x_!Ln;`PC9XJ3Zj@}jf8YVb zvWqPJ#u~~W|1-N9h%&a?8>VN@ zdUhXI-v9mo!`&YJ|9`*1_u~Km^Z%<0hOsbZ|Kk=6`||()<^SuBXcR5HvFrSQVNT0G i5)Ty=)C|}K85lU`W}d0$oPPpnFoUP7pUXO@geCwHelqO< literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..34c528d3cf9e84a0679632a39a8e9236f456e624 GIT binary patch literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|mygXeTLn;`PC9WK3T*%mZ{?LNX zg={OH*bDj3d}tBCvVM_D+j$2$IoCrx*^O)d{}9<}WW##th}NPDRuUd9)^iF31o(W? e5)$~57#KRQX$kL`^k4oXYh3Ob6Mw<&;$VR?=W@% literal 0 HcmV?d00001 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");