From 2e8683604155d52ad643fed63c51767722501f9a Mon Sep 17 00:00:00 2001 From: Seil0 Date: Sat, 13 Oct 2018 00:32:29 +0200 Subject: [PATCH 1/7] small code cleanup --- .../HomeFlix/application/Main.java | 4 +-- .../application/MainWindowController.java | 25 ++----------------- .../locals/HomeFlix-Local_de_DE.properties | 2 +- .../locals/HomeFlix-Local_en_US.properties | 2 +- 4 files changed, 5 insertions(+), 28 deletions(-) diff --git a/src/main/java/kellerkinder/HomeFlix/application/Main.java b/src/main/java/kellerkinder/HomeFlix/application/Main.java index 7bc8c76..393c152 100644 --- a/src/main/java/kellerkinder/HomeFlix/application/Main.java +++ b/src/main/java/kellerkinder/HomeFlix/application/Main.java @@ -108,9 +108,7 @@ public class Main extends Application { primaryStage.setScene(scene); // append scene to stage primaryStage.show(); // show stage - System.out.println("test"); - - // startup checks TODO move to mwc + // startup checks if (!configFile.exists()) { directory.mkdir(); System.out.println("config not found"); diff --git a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java index bdf6886..f11438b 100644 --- a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java +++ b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java @@ -204,7 +204,6 @@ public class MainWindowController { public void init() { LOGGER.info("Initializing Project-HomeFlix build " + buildNumber); -// startupCheck(); main.loadSettings(); // load settings checkAutoUpdate(); @@ -214,27 +213,7 @@ public class MainWindowController { initActions(); dbController.init(); - checkAllPosters(); // TODO testing - } - - - private void startupCheck() { - if (!main.getConfigFile().exists()) { - main.getDirectory().mkdir(); - System.out.println("config not found"); - - main.addFirstSource(); // need to get local - System.out.println("source finished"); - mainWindowController.setColor("ee3523"); - mainWindowController.setFontSize(17.0); - mainWindowController.setAutoUpdate(false); - mainWindowController.setLocal(local); // local dosen't exist here - main.saveSettings(); - } - - if (!main.getPosterCache().exists()) { - main.getPosterCache().mkdir(); - } + posterModeStartup(); // TODO testing } // Initialize general UI elements @@ -546,7 +525,7 @@ public class MainWindowController { // general fxml actions @FXML private void aboutBtnAction() { - String bodyText = "cemu_UI by @Seil0 \nVersion: " + version + " (Build: " + buildNumber + ") \"" + String bodyText = "Project HomeFlix \nVersion: " + version + " (Build: " + buildNumber + ") \"" + versionName + "\" \n" + getBundle().getString("infoText"); JFXInfoAlert infoAlert = new JFXInfoAlert("Project HomeFlix", bodyText, btnStyle, main.getPrimaryStage()); infoAlert.showAndWait(); diff --git a/src/main/resources/locals/HomeFlix-Local_de_DE.properties b/src/main/resources/locals/HomeFlix-Local_de_DE.properties index 736e40d..4506fe1 100644 --- a/src/main/resources/locals/HomeFlix-Local_de_DE.properties +++ b/src/main/resources/locals/HomeFlix-Local_de_DE.properties @@ -32,7 +32,7 @@ columnFavorite = Favorit #error translations vlcNotInstalled = Um einen Film abspielen wird der VLC Media Player ben\u00F6tigt! -infoText = \nAutoren: \n \u2022 seil0@mosad.xyz \n \u2022 hendrik.schutter@coptersicht.de \n(c) 2016-2018 mosad www.mosad.xyz +infoText = \nAutoren: \n \u2022 seil0@mosad.xyz \n \u2022 localhorst@mosad.xyz \n(c) 2016-2018 mosad www.mosad.xyz #textFlow translations title = Titel diff --git a/src/main/resources/locals/HomeFlix-Local_en_US.properties b/src/main/resources/locals/HomeFlix-Local_en_US.properties index 5fe7c1e..f0d0a38 100644 --- a/src/main/resources/locals/HomeFlix-Local_en_US.properties +++ b/src/main/resources/locals/HomeFlix-Local_en_US.properties @@ -32,7 +32,7 @@ columnFavorite = Favorite #error translations vlcNotInstalled = VLC Media Player is required to play a movie! -infoText = \nMaintainers: \n \u2022 seil0@mosad.xyz \n \u2022 hendrik.schutter@coptersicht.de \n(c) 2016-2018 mosad www.mosad.xyz +infoText = \nMaintainers: \n \u2022 seil0@mosad.xyz \n \u2022 localhorst@mosad.xyz \n(c) 2016-2018 mosad www.mosad.xyz #textFlow translations title = Title From 4d31e53a7ce186ad9e22d6b0b0efa8fefd011ebd Mon Sep 17 00:00:00 2001 From: Seil0 Date: Thu, 25 Oct 2018 10:07:57 +0200 Subject: [PATCH 2/7] updated gitignore to ignore eclipse files --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f8db64b..8b5a8ae 100644 --- a/.gitignore +++ b/.gitignore @@ -49,4 +49,6 @@ config.xml .directory target/ apiKeys.json - +.classpath +.project +./settings/* From ffe068e1b01497b844d2b496cacc8351c08c9e08 Mon Sep 17 00:00:00 2001 From: Seil0 Date: Thu, 25 Oct 2018 10:08:14 +0200 Subject: [PATCH 3/7] =?UTF-8?q?=E2=80=9E.classpath=E2=80=9C=20l=C3=B6schen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .classpath | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 .classpath diff --git a/.classpath b/.classpath deleted file mode 100644 index 7f5ea8f..0000000 --- a/.classpath +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 5a3b6470608e371533751a251f4b4be1affcf39e Mon Sep 17 00:00:00 2001 From: Seil0 Date: Thu, 25 Oct 2018 10:08:23 +0200 Subject: [PATCH 4/7] =?UTF-8?q?=E2=80=9E.project=E2=80=9C=20l=C3=B6schen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .project | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 .project diff --git a/.project b/.project deleted file mode 100644 index 01f0bec..0000000 --- a/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - Project-HomeFlix - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - From b8a67fbc27e14338c761c1d56e35341d5e68744e Mon Sep 17 00:00:00 2001 From: Seil0 Date: Thu, 25 Oct 2018 16:32:33 +0200 Subject: [PATCH 5/7] removed eclipse specific files --- .settings/org.eclipse.core.resources.prefs | 5 ----- .settings/org.eclipse.jdt.core.prefs | 14 -------------- .settings/org.eclipse.m2e.core.prefs | 4 ---- 3 files changed, 23 deletions(-) delete mode 100644 .settings/org.eclipse.core.resources.prefs delete mode 100644 .settings/org.eclipse.jdt.core.prefs delete mode 100644 .settings/org.eclipse.m2e.core.prefs diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 839d647..0000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b807efd..0000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,14 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 From 0cf02c52a69f8b96beb10bf27073243e24de2aeb Mon Sep 17 00:00:00 2001 From: Seil0 Date: Thu, 25 Oct 2018 16:33:35 +0200 Subject: [PATCH 6/7] updated gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8b5a8ae..43baad2 100644 --- a/.gitignore +++ b/.gitignore @@ -51,4 +51,4 @@ target/ apiKeys.json .classpath .project -./settings/* +.settings/* From fed25f2fcec70f470b25a242e5c829d0747ffc28 Mon Sep 17 00:00:00 2001 From: Seil0 Date: Wed, 7 Nov 2018 16:35:27 +0100 Subject: [PATCH 7/7] =?UTF-8?q?=E2=80=9EREADME.md=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f723ea0..a6e8e4e 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ minimal-json: https://github.com/ralfstx/minimal-json sqlite-jdbc: https://github.com/xerial/sqlite-jdbc apache commons io : https://commons.apache.org/proper/commons-io/ -## screenshots -![Screenshot](https://github.com/Seil0/Seil0.github.io/blob/master/images/Project-HomeFlix_MainWindow.png) +## Screenshots +![Screenshot](https://raw.githubusercontent.com/Seil0/Seil0.github.io/master/images/Project-HomeFlix_MainWindow.png) Project-HomeFlix © 2016-2018 mosad www.mosad.xyz, Project by [@Seil0](https://git.mosad.xyz/Seil0) and [@localhorst](https://git.mosad.xyz/localhorst) \ No newline at end of file